Revert "settings: Various cleanups"

This reverts commit e7fc1caa0dfbddada12f76622b8cbdc5443b0947.