This reverts commit 80a2de87c480150c265f4528ecf388cb6fd450b8. Change-Id: Ifc397e9f941fb1853b0a2790b9bf2d31bd652506