Revert "Switch to new Superuser"

This reverts commit 41cd8e5d9ae03712c7a4910476ce50e5380eb008.