This reverts commit1daf2e26d2, reversing changes made toc0c50dfcb7. It seems this is what has been causing all the reliability problems on Hydra. I'm currently unable to find why it happens, so I'm forced to revert the update for now. Discussion: #22874.