Revert "Temp fix for SuperUser"

This reverts commit 441e377cc9ba8d86222f904c3d392d3eae32a15d.