This reverts commit 0aca4313. Reason for revert: 133129040 Change-Id: I9a974018d4155426b1050a4b80b82f4bf4a9d996