Revert all changes

Change-Id: I04dd7fd81def64e9baca4d1d7043ca742e0614ef