This reverts commit 5a9ed2de272912ac74ed56bfec4bdf4551f7b38e. As it broke an internal test.
Closes #19100 PR Close #19753
Fixes #16919 Fixes #16918