This reverts commit baccf15a4adafe3fb3fdf23c35ea29d95c45c89b. Change-Id: If218d579cbf473fdab2b16a715a5dbb75dc9fbbc