Index: trunk/resources/data/validator/combinations.mapcss
===================================================================
--- trunk/resources/data/validator/combinations.mapcss	(revision 16655)
+++ trunk/resources/data/validator/combinations.mapcss	(revision 16656)
@@ -40,5 +40,4 @@
 way[traffic_mode               ][!railway][route!=railway],
 way[workrules                  ][!railway][route!=railway],
-way[stream                     ][!waterway],
 way[length_unit                ][!waterway],
 way[canal                      ][!waterway],
Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 16655)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 16656)
@@ -1982,2 +1982,10 @@
   group: tr("deprecated tagging");
 }
+
+/* #19396 */
+way[stream=intermittent] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "intermittent=yes";
+  suggestAlternative: "seasonal=yes";
+  group: tr("deprecated tagging");
+}