Revert "Switch to new Superuser"

This reverts commit 70af91af1808ef31efc7cb9db54e3e0ca22b0eb0.