a9aa2c6bb3
This reverts commit c093b25c75.
Reason for revert: seems the flake isn't flaking after this change
Change-Id: I03c003103b610fcdd174fbf820c428d337d9109b