This reverts commit 371427b53c70d1a71012de404c29187fe303a22a. bug:12099469 Change-Id: I497832b54856a9909fc8651ee67555e02e0e763e