Revert "QuickSettings: cleanup"

This reverts commit d5653bd2443cd73329b73b837c19ce5f0a3291af.