Have forwarded 02_remove_config_files.patch to upstream