This reverts commit 5a9ed2de27. As it broke an internal test.
5a9ed2de27
Closes #19100 PR Close #19753
Closes #15170