Revert "refs #33279"

Reverts aipocom/aipo#472