This reverts commits c4e35c98f4, c4e35c98f4. Change-Id: I50e44e0c24144a04347760313e5dae576e6704e3
c4e35c98f4