This reverts commit aafcfca5. Bug: 21333911 (cherry picked from commit 18a1827a) Change-Id: Ibbc6b1be8bebc1d0ab9c5955b34eb89f40577baa