Rolling back --settings code