This reverts commit cd4aeef8. Bug: 36027342 Bug: 36015884 Change-Id: Ifd5b69caf64d65a8cd6570b7fe1fb6abe90e30b8