Revert "refs #33297"

Reverts aipocom/aipo#480