Revert some commits

Change-Id: I2ddb5405176c87ef52ab5b8f39c39d6443df807c