Undo accidently overwritten changes

Change-Id: Ia58dba16564262664903cb37acd3f126f5a38ff7
Merge "Undo accidently overwritten changes"