Revert superuser changes for now

Revert "Add preference for enabling root access (3/3)"

This reverts commit b19745d3cb30229f0cd8928175e76c3bf2836a1a.

Revert "Switch to new Superuser"

This reverts commit c12c06b7f0a854f5d72c62195a89083b8f5afd7f.