Revert "missing old string"

This reverts commit 9a4b530e596d360d722e833793ebe2af75021acb.
Revert "Re-organize Settings/System"

This reverts commit b5d642d913b3297836d1040cb320538e9a493dba.