Revert " Switch to new Superuser (credits go to koush)"

This reverts commit 16f8f321772f2c8933bf81221ff84c7b538a333c.