From 230712584210d4a27df15ced08d5f4807f926c92 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Sun, 30 Jun 2019 01:24:42 -0400
Subject: [PATCH] Remove existing NSI keys before upgrading to a NSI preset
 (closes #6575)

---
 modules/validations/outdated_tags.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/validations/outdated_tags.js b/modules/validations/outdated_tags.js
index 696ebf2ad..a8a01e0c8 100644
--- a/modules/validations/outdated_tags.js
+++ b/modules/validations/outdated_tags.js
@@ -102,6 +102,7 @@ export function validationOutdatedTags(context) {
                 var brand = brands.brands[match.kvnd];
                 if (brand && brand.tags['brand:wikidata']) {
                     subtype = 'noncanonical_brand';
+                    nsiKeys.forEach(function(remove) { delete newTags[remove]; });
                     Object.assign(newTags, brand.tags);
                     break;
                 }