Partial revert of 50a3ce5703bdaa4fe16e2e773eabafa9a4818083 Closes #18487 Closes #18490 Closes #18497 (cherry picked from commit 27fb5fc16d88c0002898981009bedc6b8001cac7)
Partial revert of 50a3ce5703bdaa4fe16e2e773eabafa9a4818083 Closes #18487 Closes #18490 Closes #18497 (cherry picked from commit 27fb5fc16d88c0002898981009bedc6b8001cac7)