Revert "refs #33317"

Reverts aipocom/aipo#471