Revert "refs #31668"

Reverts aipocom/aipo#246