Index: src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java	(revision 5740)
+++ src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java	(working copy)
@@ -80,6 +80,10 @@
         checks.add(new DeprecationCheck(2115).
                 testAndRemove("bicycle_parking", "sheffield").
                 add("bicycle_parking", "stands"));
+        checks.add(new DeprecationCheck(2116).
+                testAndRemove("type", "multipolygon").
+                testAndRemove("boundary", "administrative").
+                add("type", "boundary"));
     }
 
     public void visit(OsmPrimitive p) {
Index: src/org/openstreetmap/josm/actions/upload/FixDataHook.java
===================================================================
--- src/org/openstreetmap/josm/actions/upload/FixDataHook.java	(revision 5740)
+++ src/org/openstreetmap/josm/actions/upload/FixDataHook.java	(working copy)
@@ -41,15 +41,6 @@
         deprecated.add(new FixDataTag("oneway",  "true",  "oneway",  "yes"));
         deprecated.add(new FixDataTag("oneway",  "1",     "oneway",  "yes"));
         deprecated.add(new FixDataTag("highway", "stile", "barrier", "stile"));
-        deprecated.add(new FixData() {
-            public boolean fixKeys(Map<String, String> keys, OsmPrimitive osm) {
-                if(osm instanceof Relation && "multipolygon".equals(keys.get("type")) && "administrative".equals(keys.get("boundary"))) {
-                    keys.put("type", "boundary");
-                    return true;
-                }
-                return false;
-            }
-        });
     }
 
     /**