Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 14040)
+++ trunk/data/validator/combinations.mapcss	(revision 14041)
@@ -218,6 +218,4 @@
 *[amenity=vending_machine][shop],
 *[noname?][name],
-way[man_made=pipeline][tunnel=flooded],
-way[waterway=canal][tunnel=yes],
 way[oneway=yes][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath],
 way[oneway=yes][/:forward/][!traffic_sign:forward][bicycle:forward!=use_sidepath],
@@ -234,5 +232,7 @@
 }
 
-/* {0.tag} together with {1.tag}, see #10186 */
+/* {0.tag} together with {1.tag}, see #16147, #10186 */
+way[man_made=pipeline][tunnel=flooded],
+way[waterway=canal][tunnel=yes],
 way[highway=footway][bicycle=designated] {
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");