This reverts commit dfe0a66ceca530e0777ebfab20f81103baa18f14. Change-Id: I58a1bae649a284f3d3b6213064d903ea7fcf185a