bb9fe16254
This reverts commit 06be7eb88e.
Reason for revert: Potential forward fix with ag/24562796
Change-Id: I1f01dda728491e627ec0cc34fd364cbd794854d5