This reverts commit fcf01503. Bug: 26587386 Bug: 27759382 Change-Id: Iedfe3657b51c3965bcbddb6b2dc6dfbc1d7b9c37