This reverts commit 39b7353acacf08a3c0204a9ec122fff420e53310. Change-Id: I732eab8a2843dd23c86bd1526ec95db5352d39a0