Revert "Misc follow-ups to I2fc3966e (a161c5e)"

That apparently caused bug 46397.

This reverts commit 388b14a15de6c531d876796dde02605f046fcf53


Bug : 46397
Change-Id: Ideaa86f0d535873a08e27d6f98f6bd4255b8c594