This reverts commit 9a0dd58e. Bug: 37794067,32981344 Test: make Change-Id: Id13dac962ff9fea890375f0d87da155282c1d55b