diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextWithSummaryItem.php b/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextWithSummaryItem.php
index 33280c1..8d5c9fb 100644
--- a/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextWithSummaryItem.php
+++ b/core/modules/text/lib/Drupal/text/Plugin/field/field_type/TextWithSummaryItem.php
@@ -20,9 +20,7 @@
  *   description = @Translation("This field stores long text in the database along with optional summary text."),
  *   instance_settings = {
  *     "text_processing" = "1",
- *     "display_summary" = "0",
- *     "required_summary" = "0",
- *     "show_summary" = "0"
+ *     "display_summary" = "0"
  *   },
  *   default_widget = "text_textarea_with_summary",
  *   default_formatter = "text_default"
@@ -126,22 +124,6 @@ public function instanceSettingsForm(array $form, array &$form_state) {
       '#default_value' => $settings['display_summary'],
       '#description' => t('This allows authors to input an explicit summary, to be displayed instead of the automatically trimmed text when using the "Summary or trimmed" display type.'),
     );
-    $element['required_summary'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Require summary'),
-      '#description' => t('The summary will also be visible when marked as required.'),
-      '#default_value' => !empty($settings['required_summary']),
-    );
-    $element['show_summary'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Always show summary'),
-      '#default_value' => !empty($settings['show_summary']),
-      '#states' => array(
-        'invisible' => array(
-          'input[name="instance[settings][required_summary]"]' => array('checked' => TRUE),
-        ),
-      ),
-    );
 
     return $element;
   }
diff --git a/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php b/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php
index 0886a5a..a6edca8 100644
--- a/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php
+++ b/core/modules/text/lib/Drupal/text/Plugin/field/widget/TextareaWithSummaryWidget.php
@@ -61,27 +61,23 @@ public function settingsSummary() {
    */
   function formElement(FieldInterface $items, $delta, array $element, $langcode, array &$form, array &$form_state) {
     $element = parent::formElement($items, $delta, $element, $langcode, $form, $form_state);
-    $display_summary = $items[$delta]->summary || $this->getFieldSetting('display_summary');
-    $required = empty($form['#type']) && $this->getFieldSetting('required_summary');
 
+    $display_summary = $items[$delta]->summary || $this->getFieldSetting('display_summary');
     $element['summary'] = array(
       '#type' => $display_summary ? 'textarea' : 'value',
       '#default_value' => $items[$delta]->summary,
       '#title' => t('Summary'),
       '#rows' => $this->getSetting('summary_rows'),
-      '#description' => empty($this->instance['settings']['required_summary']) ? t('Leave blank to use trimmed value of full text as the summary.') : '',
+      '#description' => t('Leave blank to use trimmed value of full text as the summary.'),
+      '#attached' => array(
+        'library' => array(array('text', 'drupal.text')),
+      ),
       '#attributes' => array('class' => array('text-summary')),
       '#prefix' => '<div class="text-summary-wrapper">',
       '#suffix' => '</div>',
       '#weight' => -10,
-      // Make sure the summary is not required for the default widget.
-      '#required' => $required && !isset($form_state['default_value_widget']),
     );
 
-    if (!$this->getFieldSetting('show_summary') && !$required) {
-      $element['summary']['#attached']['library'] = array(array('text', 'drupal.text'));
-    }
-
     return $element;
   }
 
diff --git a/core/modules/text/lib/Drupal/text/Tests/TextFieldUnitTestBase.php b/core/modules/text/lib/Drupal/text/Tests/TextFieldUnitTestBase.php
deleted file mode 100644
index 0fad2d0..0000000
--- a/core/modules/text/lib/Drupal/text/Tests/TextFieldUnitTestBase.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\options\Tests\OptionsFieldUnitTestBase.
- */
-
-
-namespace Drupal\text\Tests;
-
-use Drupal\field\Tests\FieldUnitTestBase;
-
-/**
- * Defines a common base test class for unit tests of the options module.
- */
-class TextFieldUnitTestBase extends FieldUnitTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('text');
-
-  /**
-   * The field name used in the test.
-   *
-   * @var string
-   */
-  protected $fieldName = 'test_textwithsummary';
-
-  /**
-   * The field definition used to created the field entity.
-   *
-   * @var array
-   */
-  protected $fieldDefinition;
-
-  /**
-   * The list field used in the test.
-   *
-   * @var \Drupal\field\Plugin\Core\Entity\Field
-   */
-  protected $field;
-
-  /**
-   * The list field instance used in the test.
-   *
-   * @var \Drupal\field\Plugin\Core\Entity\FieldInstance
-   */
-  protected $instance;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp() {
-    parent::setUp();
-
-    $this->installSchema('system', 'menu_router', 'url_alias', 'filter');
-    $this->installConfig(array('filter', 'text'));
-
-    $this->fieldDefinition = array(
-      'field_name' => $this->fieldName,
-      'type' => 'text_with_summary',
-      'cardinality' => 1,
-      'settings' => array(
-        'max_length' => 200,
-      )
-    );
-    $this->field = entity_create('field_entity', $this->fieldDefinition);
-    $this->field->save();
-
-    $this->instance = entity_create('field_instance', array(
-      'field_name' => $this->fieldName,
-      'entity_type' => 'entity_test',
-      'bundle' => 'entity_test',
-      'settings' => array(
-        'text_processing' => TRUE,
-        'display_summary' => 1,
-        'required_summary' => 1,
-        'show_summary' => 1,
-      ),
-    ));
-    $this->instance->save();
-
-    entity_get_form_display('entity_test', 'entity_test', 'default')
-      ->setComponent($this->fieldName, array(
-        'type' => 'text_textarea_with_summary',
-        'settings' => array(
-          'summary_rows' => 2,
-        ),
-      ))
-      ->save();
-  }
-
-}
diff --git a/core/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php b/core/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php
index 3dec81c..b287a62 100644
--- a/core/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php
+++ b/core/modules/text/lib/Drupal/text/Tests/TextSummaryTest.php
@@ -7,16 +7,14 @@
 
 namespace Drupal\text\Tests;
 
-use Drupal\Core\Language\Language;
-use Drupal\field\FieldException;
-use Drupal\field\Tests\FieldUnitTestBase;
+use Drupal\simpletest\DrupalUnitTestBase;
 
 /**
  * Tests the text field summary.
  */
-class TextSummaryTest extends TextFieldUnitTestBase {
+class TextSummaryTest extends DrupalUnitTestBase {
 
-  public static $modules = array('filter', 'text');
+  public static $modules = array('system', 'user', 'filter', 'text');
 
   public static function getInfo() {
     return array(
@@ -26,6 +24,13 @@ public static function getInfo() {
     );
   }
 
+  function setUp() {
+    parent::setUp();
+
+    $this->installSchema('system', 'url_alias');
+    $this->installConfig(array('text'));
+  }
+
   /**
    * Tests an edge case where the first sentence is a question and
    * subsequent sentences are not. This edge case is documented at
@@ -219,17 +224,4 @@ function assertTextSummary($text, $expected, $format = NULL, $size = NULL) {
     )));
   }
 
-  /**
-   * Test required summary.
-   */
-  function testRequiredSummary() {
-    $langcode = Language::LANGCODE_NOT_SPECIFIED;
-
-    // Check the required summary.
-    $entity = entity_create('entity_test', array());
-    $form = \Drupal::entityManager()->getForm($entity);
-    $this->assertTrue(!empty($form[$this->fieldName][$langcode][0]['summary']), 'Summary field is shown');
-    $this->assertTrue(!empty($form[$this->fieldName][$langcode][0]['summary']['#required']), 'Summary field is required');
-  }
-
 }