Revert to old Settings branch. No changes needed.