Revert PR #16861

Refs #16861

Develop is having a tough time with test failures. I'm reverting the offending PR, with the approval of @cachedout. This will hopefully set things back to blue. :)