3ddd00ee3c
This reverts commit 5156b48f6c.
Reason for revert: Fixed test failures from flipping the flag on in ag/22066273 and ag/21992972
Change-Id: I0478869c22a8f23d81a688bfa07a40230521f638