Reverting some commits

Change-Id: Id73ecbbca0d2c224636e3e425de28e5242e29b10