Revert "refs #33426"

Reverts aipocom/aipo#495