Revert 4 commits

Change-Id: I818ba98df06d22c3046d19ee4be3949a16db5322