revert Superuser implementation (2/2)

Change-Id: I2964f13d7e37e34d0856429c35c237696ca4bd63