This reverts commit a52a531a due to regressions described in refs #26772. Backport of 7def55c3 from master