This reverts commit 4e5378c2646d0b72ea12f9f1b8a301a007cabe65. Change-Id: I1462a7cc9b7b2a6a1974ef13998d2310740ce2b8