Revert "settings: Various cleanups"

This reverts commit 1f024230b4dae4a06e9f159c9d76be62c1343cc6.