This reverts commit 0401388028. Bug: 26831671 Change-Id: Ibe5ae3c7da400efb389f905b1111f029b6a8bfaf
0401388028