Revert "Switch to new Superuser"

This reverts commit 1d647e9ae9622418a871246e657a7d74c798bf3a.
Switch to open source superuser

Change-Id: I0882b4bb296af041ec5766ff29a605554f13b0a7