"Switch to new Superuser" fix
Forgotten one conflict, now fixed.