This patch reverts the commit 62f59238eca319f00d1685d20e776c68cfe8f3f0. Change-Id: I4446a4b6ffaf3e4ac0a6ca5baa31d0573afdf001