Updated to match Salt's settings changes.