Revert "Settings commit to go with QS cleanup"

This reverts commit 30e953d6e58c1fba32329c54b7c2e5c6460f496f.