Revert "Revert "Switch to new Superuser""

This reverts commit 9ddcc667ec543bfec2514d8fdb1c971fab610e33.