6f76dd58f4
This reverts commit c819dbe95b.
Bug: http://b/19702273
Change-Id: I5c75b148a12e644dd247a4df4f67dc9b4b9ff8cf