13a229c318
This reverts commit 520d9133a3.
Reason for revert: b/130438597#6 outlines why we can't yet check this in.
Change-Id: Id7a00e926b16ca2ffc3396cbfae19c753b4b7ee9