This reverts commit f2931182. This was again causing buildbot failures. #83962 has been updated with the new failures, notifying the buildbot maintainers that they need to update their bots.
mentioned in commit 33f4a77d
·mentioned in commit 33f4a77d