Partly revert 'Superuser: fix ups'