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