Revert all changes

Change-Id: Iae3d11d18c77377af1613a0bf7db389ef9a15062