This reverts commit 094904303d, reapplying d7afafdbc4 (#133247). The failure ought to be fixed by 0509932bb6.
094904303d
d7afafdbc4
0509932bb6