Updated the config file generation to use what upstream uses now.