Partly revert 'Superuser: fix ups'
Merge pull request #4 from Mahdi-Rom/kk-4.4

Partly revert 'Superuser: fix ups'