This was originally reported in #16373. Opening a new issue because a temporary fix was applied to close that (#16868).

The issue was introduced with f2d813c. It can be repro'd by reverting the temporary fix and running the test suite - you can run the specific test it first fails on and that's sufficient to test whether the issue is present or not.