This reverts commit 16185f66f1e500d61d43550e7c847a36ad1032df. Which was fixed by d000574380baba7b63fdcde713b51f8318509474. Closes #25762