diff --git a/core/modules/comment/comment.field.inc b/core/modules/comment/comment.field.inc
index 74f55ca..74593c6 100644
--- a/core/modules/comment/comment.field.inc
+++ b/core/modules/comment/comment.field.inc
@@ -17,7 +17,6 @@ function comment_field_info() {
     'comment' => array(
       'label' => t('Comments'),
       'description' => t('This field manages configuration and presentation of comments on an entity'),
-      'settings' => array(),
       'instance_settings' => array(
         // Save this settings to allow other modules to migrate their data.
         // @todo The "comment_default" formatter settings should used instead.
diff --git a/core/modules/comment/comment.install b/core/modules/comment/comment.install
index 69aadcc..948c680 100644
--- a/core/modules/comment/comment.install
+++ b/core/modules/comment/comment.install
@@ -564,7 +564,6 @@ function comment_update_8006(&$sandbox) {
       // We need one per content type to match the existing comment bundles.
       'id' => $field_name,
       'module' => 'comment',
-      'settings' => array(),
       'translatable' => '0',
       'type' => 'comment',
     );
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index a972731..f3879f4 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1056,8 +1056,8 @@ function comment_form_field_ui_field_edit_form_alter(&$form, $form_state) {
   if ($form['#field']['type'] == 'comment') {
     // We only support posting one comment at the time so it doesn't make sense
     // to let the site builder choose anything else.
-    $form['field']['container']['cardinality']['#options'] = drupal_map_assoc(array(1));
-    $form['field']['container']['#access'] = FALSE;
+    $form['field']['cardinality_container']['cardinality']['#options'] = drupal_map_assoc(array(1));
+    $form['field']['cardinality_container']['#access'] = FALSE;
   }
 }
 
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentUninstallTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentUninstallTest.php
index 48e749f..25ad9c7 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentUninstallTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentUninstallTest.php
@@ -32,9 +32,10 @@ public static function getInfo() {
   protected function setUp() {
     parent::setup();
 
-    // Create a content type so that the comment module creates the
-    // 'comment_body' field upon installation.
-    $this->drupalCreateContentType();
+    // Create an article content type.
+    $this->drupalCreateContentType(array('type' => 'article', 'name' => t('Article')));
+    // Create comment field on article so that adds 'comment_body' field.
+    comment_add_default_comment_field('node', 'article');
   }
 
   /**