Revert "superuser to us"

This reverts commit 935c8a69f7292ac95620ab46ca668b133c5a7ce0.

Conflicts:
	default.xml