refs #33980
Merge pull request #638 from aipocom/bugfix/revert1

refs #33980