--- node.module	2012-02-01 13:48:38.043465629 +0100
+++ node.module	2012-01-31 11:49:19.533985137 +0100
@@ -1106,7 +1106,7 @@
   }
   $output = node_view($node, FALSE, TRUE);
 
-  if (function_exists('comment_render') && $node->comment) {
+  if (function_exists('comment_render') && $node->comment && variable_get('comment_display_'. $node->type, FALSE) == FALSE) {
     $output .= comment_render($node, $cid);
   }