This reverts commit 12f460e9e6. It doesn't build. Discuss at #29784.
12f460e9e6
fixes #29784
Closes #17054