diff --git a/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php b/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php
index 24293f9..b0ec1bd 100644
--- a/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php
+++ b/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php
@@ -11,6 +11,7 @@
 use Drupal\comment\Entity\CommentType;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Render\Element;
 use Drupal\Core\TypedData\DataDefinition;
 use Drupal\Core\Field\FieldItemBase;
 use Drupal\Core\Session\AnonymousUserSession;
@@ -107,6 +108,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
     $anonymous_user = new AnonymousUserSession();
 
     $element['comment'] = array(
+      '#process' => array(array(get_class($this), 'processCommentSettings')),
       '#type' => 'details',
       '#title' => t('Comment form settings'),
       '#open' => TRUE,
@@ -210,4 +212,17 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
     return $element;
   }
 
+  /**
+   * Form builder process callback.
+   */
+  public static function processCommentSettings(&$element) {
+    $parents = $element['#parents'];
+    // Remove the 'comment' nesting.
+    array_pop($parents);
+    foreach (Element::children($element) as $key) {
+      $element[$key]['#parents'] = array_merge($parents, array($key));
+    }
+    return $element;
+  }
+
 }
diff --git a/core/modules/comment/src/Tests/CommentNonNodeTest.php b/core/modules/comment/src/Tests/CommentNonNodeTest.php
index ec9b630..26823f5 100644
--- a/core/modules/comment/src/Tests/CommentNonNodeTest.php
+++ b/core/modules/comment/src/Tests/CommentNonNodeTest.php
@@ -353,12 +353,16 @@ function testCommentFunctionality() {
     $this->assertNoFieldChecked('edit-default-value-input-comment-0-status-1');
     $this->assertFieldChecked('edit-default-value-input-comment-0-status-2');
     // Test comment option change in field settings.
-    $edit = array('default_value_input[comment][0][status]' => CommentItemInterface::CLOSED);
+    $edit = array(
+      'default_value_input[comment][0][status]' => CommentItemInterface::CLOSED,
+      'field[settings][anonymous]' => COMMENT_ANONYMOUS_MAY_CONTACT,
+    );
     $this->drupalPostForm(NULL, $edit, t('Save settings'));
     $this->drupalGet('entity_test/structure/entity_test/fields/entity_test.entity_test.comment');
     $this->assertNoFieldChecked('edit-default-value-input-comment-0-status-0');
     $this->assertFieldChecked('edit-default-value-input-comment-0-status-1');
     $this->assertNoFieldChecked('edit-default-value-input-comment-0-status-2');
+    $this->assertFieldByName('field[settings][anonymous]', COMMENT_ANONYMOUS_MAY_CONTACT);
 
     // Add a new comment-type.
     $bundle = CommentType::create(array(