This reverts commit f00de413ed. Bug: 17645833 Change-Id: Ie5480de9cf4da2c9167db2e6137679019a29f867
f00de413ed