Recommitting old settings because I think last commit broke things.