[PATCH] location-importer: Only delete override data if we are sure to have a valid replacement