Revert  Possible fix for superuser.

Change-Id: I826c9bc04e896b2ead770ba900a70f48ae9cf0c5

Author: winner00