diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 9ee6f81..6e87dc1 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1200,7 +1200,7 @@ function comment_node_load($nodes, $types) {
 /**
  * Implements hook_node_prepare().
  */
-function comment_node_prepare(Node $node) {
+function comment_node_create(Node $node) {
   if (!isset($node->comment)) {
     $node->comment = variable_get("comment_$node->type", COMMENT_NODE_OPEN);
   }
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
index bda6368..695d65f 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
@@ -123,6 +123,11 @@ function testCommentInterface() {
     $this->drupalGet('comment/reply/' . $this->node->nid . '/' . $reply_loaded->id());
     $this->assertText(t('The comment you are replying to does not exist.'), 'Replying to an unpublished comment');
 
+    // Check if the comment node property is set to default value.
+    $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'comment' => NULL));
+    $this->assertTrue($this->node, 'Article node created.');
+    $this->assertEqual($this->node->comment, variable_get("comment_{$this->node->type}", COMMENT_NODE_OPEN), 'Article comment proprety is set to default value.');
+
     // Attempt to post to node with comments disabled.
     $this->node = $this->drupalCreateNode(array('type' => 'article', 'promote' => 1, 'comment' => COMMENT_NODE_HIDDEN));
     $this->assertTrue($this->node, 'Article node created.');