Revert all changes

Change-Id: I4e88bef2b9338283c7e89096ee177be8db21d950