Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 18543)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 18544)
@@ -322,5 +322,5 @@
 }
 
-/* #10107, #10108, #10929, #13391 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
+/* #10107, #10108, #10929, #13391, #22336 - http://wiki.openstreetmap.org/wiki/Proposed_features/leaftype#Features.2FPages_affected */
 *[type=broad_leaved],
 *[type=broad_leafed] {
@@ -355,4 +355,5 @@
   fixAdd: "leaf_cycle=evergreen";
 }
+*[wood=deciduous],
 *[type=deciduous],
 *[type=deciduos] {
@@ -360,11 +361,6 @@
   suggestAlternative: "leaf_cycle=deciduous";
   group: tr("deprecated tagging");
-  fixRemove: "type";
+  fixRemove: "{0.key}";
   fixAdd: "leaf_cycle=deciduous";
-}
-*[wood=deciduous] {
-  throwWarning: tr("{0} is deprecated", "{0.tag}");
-  suggestAlternative: "leaf_type + leaf_cycle";
-  group: tr("deprecated tagging");
 }
 node[type=palm],