This reverts commit e0b5bf50d6. Change-Id: I2f3f10c149b205d22c41d5c9767ea10b0dee7682
e0b5bf50d6
b6ed343e85
7644b885c7