This reverts commit 0a4ac795d6. Bug: 10587358 Change-Id: Ib4c472756fb9a6ebba4a66d34a9652f1b5afc714
0a4ac795d6