Revert "Switch to new Superuser"

This reverts commit ac12d1636fba7a37be87f91ce727313c9dad67eb.