This reverts commit d95e84447136378982e137e54b290ed49bb6a400. Change-Id: I2c461661d1e634146d735f4b37eb2b2018d3a0bb