Revert Settings changes in sonar-min, at least until we get some more testing