bring back @jonahss's settings api changes
Merge pull request #3590 from jlipps/fix-3575

bring back @jonahss's settings api changes