Revert "Fix buildbots after 61a85da"

This reverts commit c609d533634416fc701939d39bf1e43f293e84dc.
61a85da was reverted in ab98f2c7

GitOrigin-RevId: 98eea392cdbcdb7360e58b46e9329573f092cd96
1 file changed