Revert "refs #33277"

Reverts aipocom/aipo#474