Revert all changes

Change-Id: I63cebf03b9d00f7b09ad40e3d092a29e1cdb1a4b