This reverts commit dcade18113. Bug: 4379983 Change-Id: I2448d8f03990a39a3e328a88904d82efc70241a2
dcade18113