56ccf74899
This reverts commit 8771dfe3dd.
Reason for revert: was only a temporary fix while investigating issue, should be unnecessary after ag/27089675 is landed.
Change-Id: I5963dc77f31eb45c1cdd100788b045891de2d716