This reverts commit 0fef203b1f. This introduced some other issues, as discussed in #72144.
0fef203b1f