This reverts commit e8bbb3d9db797dab7c2f947cc43e8d0f168e4953. Change-Id: Ie368d36fd249d323d859d208609c711f04537bbc