1234090589
This reverts commit 4b960d1f11.
Reason for revert: Breaking presubmit, no bug number yet
Change-Id: I0bafad8bf63fae1d9408b65c6c18c79ab5d40d05