Revert all changes

Change-Id: I7368b8ceba5fa78233b7c78db85d3b3630cb51c8