Revert "Switch to new Superuser"

This reverts commit cb865186696599761935bd2cd0d340c1b69234ef.