Revert "Show Superuser entry point conditionally the correct way"

This reverts commit 640a128dfd1a04854aa6299d4deee1f88225a767.
Revert "Switch to new Superuser"

This reverts commit 41993a69efc58856c68cfd2e5ef1a9f2b3429ce4.