This reverts commit d6e3db44. See #53935 for explanations. In short, it may be causing issues with tests on the build infrastructure.