Reverting some commits

Change-Id: I5f84c8840d2add23b5e4036857397fae9f291650