Revert "SuperUser fixes"

This reverts commit 2ea80ae805c4cff88f0faf6add601a2238dca9ce.