This reverts commit 5ff61f32. Reason for revert: causes global presubmit to be very flaky, see b/130081457 Fixes: b/130081457 Change-Id: I93aa5d6686cd6b5bf831766c9e47c291749526a9