Undo the bad work of Automerger

Change-Id: I585388aebc556a094db4c22e647edacea7cde129
1 file changed