This reverts commit 1b407050 as it introduces a regression in the test for refs #26772. Backport of cd217de6 from master