Revert "refs #33318"

Reverts aipocom/aipo#473