Revert commit c5c63db33cb568738d9273fb8af0fc0f2c8d554e

Change-Id: I1ac4c9c0c61b6d1337229bc40e63a5fd3a74886d