Reversed my changes to config system and added a log message to say what
config is in use.