Revert "Switch to new Superuser"

This reverts commit b94b2710f4bd567e2baba33bf32ee9845e929abc.