Revert a few commits

Change-Id: I102230965743ce61f2c7550c9b0c723bdc853f2a