Implementation of Koush superuser (2/3)
Revert "Implementation of Koush superuser (2/3)"

This reverts commit 0f9309e4ec67201503726028e87e7f10aaa42a4f.