4e955ed606
This reverts commit 41fcfc1f72.
Reason for revert: was only a temporary fix while investigating issue, should be unnecessary after ag/27089675 is landed.
Change-Id: Ic1ab614cfc0e7bf4b82c8d0eaa1662fd4129932a