This reverts commit 24df4bffd8. Reason for revert: resubmit Change-Id: Iebc66cbce6885e06fe7691c548c1ffe950e936df
24df4bffd8