Revert "refs #33273"

Reverts aipocom/aipo#475