Revert "Switch to new Superuser"

This reverts commit 927ea118329cfd35cf61afc24183fac5952e8ec1.