Revert "refs #33718"

Reverts aipocom/aipo#571