This seems to have caused some regressions by causing a flaky failure in some
cases.  Revert the change to enable investigation.

PiperOrigin-RevId: 459331687
Change-Id: Iaa4e4bfcb3013a75a2cd72768d980ac5e450f70c