I think c1439f7 misses the point. We definitely don't want to duplicate the config file (since its an abomination in the first place) and we don't want to create two separate sections in the config file that are tightly coupled. Superseded by #511