This reverts commit c569b75249. As it was synched together with 5a9ed2de27 which broke an internal test.
c569b75249
5a9ed2de27
Closes #18983 PR Close #19449
fixes #15825