Revert "refs #33274"

Reverts aipocom/aipo#476