Revert "Switch to new Superuser"

This reverts commit 95985fe41fd5f4cf258ebb35171429ae65f21f59.