.../Field/Plugin/Field/FieldType/StringItem.php    | 25 +++++++++--
 .../Plugin/Field/FieldType/StringLongItem.php      |  5 +--
 core/modules/comment/src/CommentManager.php        |  1 -
 core/modules/editor/editor.module                  |  7 ++--
 .../editor/src/Plugin/InPlaceEditor/Editor.php     |  2 +-
 .../editor/src/Tests/QuickEditIntegrationTest.php  |  2 +-
 .../src/Tests/EntityReferenceFormatterTest.php     |  3 --
 ...e.entity_test.entity_test.field_test_import.yml |  3 +-
 ...entity_test.entity_test.field_test_import_2.yml |  3 +-
 ...entity_test.test_bundle.field_test_import_2.yml |  3 +-
 ..._test.entity_test.field_test_import_staging.yml |  3 +-
 ...est.test_bundle.field_test_import_staging_2.yml |  3 +-
 ...t.test_bundle_2.field_test_import_staging_2.yml |  3 +-
 .../migrate/process/d6/FieldInstanceSettings.php   |  4 --
 .../src/Tests/d6/MigrateFieldInstanceTest.php      |  2 +-
 core/modules/node/node.tokens.inc                  |  2 +-
 .../Tests/MultiStepNodeFormBasicOptionsTest.php    |  3 --
 .../src/Plugin/InPlaceEditor/PlainTextEditor.php   |  2 +-
 .../quickedit/src/Tests/EditorSelectionTest.php    | 26 +++---------
 .../quickedit/src/Tests/MetadataGeneratorTest.php  | 12 +++---
 .../src/Plugin/InPlaceEditor/WysiwygEditor.php     |  2 +-
 .../system/src/Tests/Entity/EntityFieldTest.php    |  5 ---
 core/modules/taxonomy/src/Entity/Term.php          |  1 -
 core/modules/text/config/schema/text.schema.yml    | 21 ++++------
 .../Field/FieldFormatter/TextDefaultFormatter.php  | 41 ------------------
 .../Field/FieldFormatter/TextTrimmedFormatter.php  | 48 ----------------------
 .../text/src/Plugin/Field/FieldType/TextItem.php   | 21 +---------
 .../src/Plugin/Field/FieldType/TextItemBase.php    |  9 ----
 .../src/Plugin/Field/FieldType/TextLongItem.php    | 21 +---------
 .../Plugin/Field/FieldType/TextWithSummaryItem.php | 12 +-----
 .../Plugin/Field/FieldWidget/TextareaWidget.php    | 14 +++----
 .../Plugin/Field/FieldWidget/TextfieldWidget.php   | 13 +++---
 .../text/src/Tests/Formatter/TextFormatterTest.php | 27 ------------
 .../text/src/Tests/Formatter/TextPlainUnitTest.php |  3 --
 core/modules/text/src/Tests/TextFieldTest.php      |  6 ---
 .../text/src/Tests/TextWithSummaryItemTest.php     | 13 ------
 core/modules/text/src/TextProcessed.php            |  7 +---
 core/modules/text/text.module                      |  9 ----
 38 files changed, 72 insertions(+), 315 deletions(-)

diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php
index ba72dc3..21305d0 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Field\FieldItemBase;
+use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\TypedData\DataDefinition;
 
 /**
@@ -16,9 +17,8 @@
  *
  * @FieldType(
  *   id = "string",
- *   label = @Translation("String"),
- *   description = @Translation("An entity field containing a string value."),
- *   no_ui = TRUE,
+ *   label = @Translation("Plain text"),
+ *   description = @Translation("A field containing a plain string value."),
  *   default_widget = "string",
  *   default_formatter = "string"
  * )
@@ -80,4 +80,23 @@ public function getConstraints() {
     return $constraints;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsForm(array &$form, FormStateInterface $form_state, $has_data) {
+    $element = array();
+
+    $element['max_length'] = array(
+      '#type' => 'number',
+      '#title' => t('Maximum length'),
+      '#default_value' => $this->getSetting('max_length'),
+      '#required' => TRUE,
+      '#description' => t('The maximum length of the field in characters.'),
+      '#min' => 1,
+      '#disabled' => $has_data,
+    );
+
+    return $element;
+  }
+
 }
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringLongItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringLongItem.php
index ec79281..b3581fb 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringLongItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringLongItem.php
@@ -14,11 +14,10 @@
  *
  * @FieldType(
  *   id = "string_long",
- *   label = @Translation("Long string"),
- *   description = @Translation("An entity field containing a long string value."),
+ *   label = @Translation("Plain long text"),
+ *   description = @Translation("A field containing a long string value."),
  *   default_widget = "string_textarea",
  *   default_formatter = "string",
- *   no_ui = TRUE
  * )
  */
 class StringLongItem extends StringItem {
diff --git a/core/modules/comment/src/CommentManager.php b/core/modules/comment/src/CommentManager.php
index a4a1170..c9828de 100644
--- a/core/modules/comment/src/CommentManager.php
+++ b/core/modules/comment/src/CommentManager.php
@@ -251,7 +251,6 @@ public function addBodyField($comment_type_id) {
         'label' => 'Comment',
         'entity_type' => 'comment',
         'bundle' => $comment_type_id,
-        'settings' => array('text_processing' => 1),
         'required' => TRUE,
       ));
       $field_instance->save();
diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index 4ee1ddd..8aabbf3 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -7,6 +7,7 @@
 
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Routing\RouteMatchInterface;
@@ -476,9 +477,9 @@ function _editor_get_processed_text_fields(ContentEntityInterface $entity) {
     return array();
   }
 
-  // Only return fields that have text processing enabled.
-  return array_keys(array_filter($field_definitions, function ($definition) {
-    return $definition->getSetting('text_processing') === TRUE;
+  // Only return text fields.
+  return array_keys(array_filter($field_definitions, function (FieldDefinitionInterface $definition) {
+    return in_array($definition->getType(), array('text', 'text_long', 'text_with_summary'));
   }));
 }
 
diff --git a/core/modules/editor/src/Plugin/InPlaceEditor/Editor.php b/core/modules/editor/src/Plugin/InPlaceEditor/Editor.php
index d729943..d50d6fc 100644
--- a/core/modules/editor/src/Plugin/InPlaceEditor/Editor.php
+++ b/core/modules/editor/src/Plugin/InPlaceEditor/Editor.php
@@ -35,7 +35,7 @@ public function isCompatible(FieldItemListInterface $items) {
     // This editor is compatible with processed ("rich") text fields; but only
     // if there is a currently active text format, that text format has an
     // associated editor and that editor supports inline editing.
-    elseif ($field_definition->getSetting('text_processing')) {
+    elseif (in_array($field_definition->getType(), array('text', 'text_long', 'text_with_summary'))) {
       if ($editor = editor_load($items[0]->format)) {
         $definition = \Drupal::service('plugin.manager.editor')->getDefinition($editor->getEditor());
         if ($definition['supports_inline_editing'] === TRUE) {
diff --git a/core/modules/editor/src/Tests/QuickEditIntegrationTest.php b/core/modules/editor/src/Tests/QuickEditIntegrationTest.php
index 531f1ac..4da4162 100644
--- a/core/modules/editor/src/Tests/QuickEditIntegrationTest.php
+++ b/core/modules/editor/src/Tests/QuickEditIntegrationTest.php
@@ -74,7 +74,7 @@ public function setUp() {
     $this->createFieldWithInstance(
       $this->field_name, 'text', 1, 'Long text field',
       // Instance settings.
-      array('text_processing' => 1),
+      array(),
       // Widget type & settings.
       'text_textarea',
       array('size' => 42),
diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceFormatterTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceFormatterTest.php
index e3653bb..767e743 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceFormatterTest.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceFormatterTest.php
@@ -69,9 +69,6 @@ public function setUp() {
       'bundle' => $this->bundle,
       'field_name' => 'body',
       'label' => 'Body',
-      'settings' => array(
-        'text_processing' => TRUE,
-      ),
     ))->save();
     entity_get_display($this->entityType, $this->bundle, 'default')
       ->setComponent('body', array(
diff --git a/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import.yml
index b5df1dc..a9ef175 100644
--- a/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import.yml
+++ b/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import.yml
@@ -8,8 +8,7 @@ description: ''
 required: false
 default_value: {  }
 default_value_function: ''
-settings:
-  text_processing: 0
+settings: { }
 field_type: text
 dependencies:
   entity:
diff --git a/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import_2.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import_2.yml
index 2d482a5..6c359e2 100644
--- a/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import_2.yml
+++ b/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.entity_test.field_test_import_2.yml
@@ -8,8 +8,7 @@ description: ''
 required: false
 default_value: {  }
 default_value_function: ''
-settings:
-  text_processing: 0
+settings: { }
 field_type: text
 dependencies:
   entity:
diff --git a/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.test_bundle.field_test_import_2.yml b/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.test_bundle.field_test_import_2.yml
index 50f76c1..7d63acb 100644
--- a/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.test_bundle.field_test_import_2.yml
+++ b/core/modules/field/tests/modules/field_test_config/config/install/field.instance.entity_test.test_bundle.field_test_import_2.yml
@@ -8,8 +8,7 @@ description: ''
 required: false
 default_value: {  }
 default_value_function: ''
-settings:
-  text_processing: 0
+settings: { }
 field_type: text
 dependencies:
   entity:
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.field_test_import_staging.yml b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.field_test_import_staging.yml
index c69e8ba..9a088dd 100644
--- a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.field_test_import_staging.yml
+++ b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.entity_test.field_test_import_staging.yml
@@ -9,8 +9,7 @@ description: ''
 required: '0'
 default_value: {  }
 default_value_function: ''
-settings:
-  text_processing: '0'
+settings: { }
 field_type: text
 dependencies:
   entity:
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.field_test_import_staging_2.yml
index 2bf3bb7..cc8ccd4 100644
--- a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.field_test_import_staging_2.yml
+++ b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle.field_test_import_staging_2.yml
@@ -9,8 +9,7 @@ description: ''
 required: '0'
 default_value: {  }
 default_value_function: ''
-settings:
-  text_processing: '0'
+settings: { }
 field_type: text
 dependencies:
   entity:
diff --git a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.field_test_import_staging_2.yml b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.field_test_import_staging_2.yml
index 9e04777..f58572a 100644
--- a/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.field_test_import_staging_2.yml
+++ b/core/modules/field/tests/modules/field_test_config/staging/field.instance.entity_test.test_bundle_2.field_test_import_staging_2.yml
@@ -9,8 +9,7 @@ description: ''
 required: '0'
 default_value: {  }
 default_value_function: ''
-settings:
-  text_processing: '0'
+settings: { }
 field_type: text
 dependencies:
   entity:
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceSettings.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
index 7f16cef..0e079fd 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/FieldInstanceSettings.php
@@ -26,10 +26,6 @@ public function transform($value, MigrateExecutable $migrate_executable, Row $ro
     list($widget_type, $widget_settings, $field_settings) = $value;
     $settings = array();
     switch ($widget_type) {
-      case 'text_textfield':
-        $settings['text_processing'] = $field_settings['text_processing'];
-        break;
-
       case 'number':
         $settings['min'] = $field_settings['min'];
         $settings['max'] = $field_settings['max'];
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php
index 9399da8..941eed1 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php
@@ -85,7 +85,7 @@ public function testFieldInstanceSettings() {
     // Test a text field.
     $field = entity_load('field_instance_config', 'node.story.field_test');
     $this->assertEqual($field->label(), 'Text Field');
-    $expected = array('max_length' => 255, 'text_processing' => 1);
+    $expected = array('max_length' => 255);
     $this->assertEqual($field->getSettings(), $expected);
     $this->assertEqual('text for default value', $entity->field_test->value);
 
diff --git a/core/modules/node/node.tokens.inc b/core/modules/node/node.tokens.inc
index 4e0f300..e5097bf 100644
--- a/core/modules/node/node.tokens.inc
+++ b/core/modules/node/node.tokens.inc
@@ -153,7 +153,7 @@ function node_tokens($type, $tokens, array $data = array(), array $options = arr
                   $length = $settings['trim_length'];
                 }
 
-                $output = text_summary($output, $field_definition->getSetting('text_processing') ? $item->format : NULL, $length);
+                $output = text_summary($output, $item->format, $length);
               }
             }
             $replacements[$original] = $output;
diff --git a/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php b/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
index 5026920..0031f67 100644
--- a/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
+++ b/core/modules/node/src/Tests/MultiStepNodeFormBasicOptionsTest.php
@@ -44,9 +44,6 @@ function testMultiStepNodeFormBasicOptions() {
       'entity_type' => 'node',
       'bundle' => 'page',
       'label' => $this->randomName() . '_label',
-      'settings' => array(
-        'text_processing' => TRUE,
-      ),
     ))->save();
     entity_get_form_display('node', 'page', 'default')
       ->setComponent($this->field_name, array(
diff --git a/core/modules/quickedit/src/Plugin/InPlaceEditor/PlainTextEditor.php b/core/modules/quickedit/src/Plugin/InPlaceEditor/PlainTextEditor.php
index 3938ce9..e7b40be 100644
--- a/core/modules/quickedit/src/Plugin/InPlaceEditor/PlainTextEditor.php
+++ b/core/modules/quickedit/src/Plugin/InPlaceEditor/PlainTextEditor.php
@@ -33,7 +33,7 @@ public function isCompatible(FieldItemListInterface $items) {
       return FALSE;
     }
     // This editor is incompatible with processed ("rich") text fields.
-    elseif ($field_definition->getSetting('text_processing')) {
+    elseif (!in_array($field_definition->getType(), array('string', 'string_long'))) {
       return FALSE;
     }
     else {
diff --git a/core/modules/quickedit/src/Tests/EditorSelectionTest.php b/core/modules/quickedit/src/Tests/EditorSelectionTest.php
index e29cd3f..c5b958a 100644
--- a/core/modules/quickedit/src/Tests/EditorSelectionTest.php
+++ b/core/modules/quickedit/src/Tests/EditorSelectionTest.php
@@ -56,45 +56,29 @@ protected function getSelectedEditor($entity_id, $field_name, $view_mode = 'defa
   public function testText() {
     $field_name = 'field_text';
     $this->createFieldWithInstance(
-      $field_name, 'text', 1, 'Simple text field',
+      $field_name, 'string', 1, 'Plain text field',
       // Instance settings.
-      array('text_processing' => 0),
+      array(),
       // Widget type & settings.
-      'text_textfield',
+      'string',
       array('size' => 42),
       // 'default' formatter type & settings.
-      'text_default',
+      'string',
       array()
     );
 
     // Create an entity with values for this text field.
     $this->entity = entity_create('entity_test');
     $this->entity->{$field_name}->value = 'Hello, world!';
-    $this->entity->{$field_name}->format = 'full_html';
     $this->entity->save();
 
     // Editor selection without text processing, with cardinality 1.
     $this->assertEqual('plain_text', $this->getSelectedEditor($this->entity->id(), $field_name), "Without text processing, cardinality 1, the 'plain_text' editor is selected.");
 
-    // Editor selection with text processing, cardinality 1.
-    $this->field_text_instance->settings['text_processing'] = 1;
-    $this->field_text_instance->save();
-    $this->assertEqual('form', $this->getSelectedEditor($this->entity->id(), $field_name), "With text processing, cardinality 1, the 'form' editor is selected.");
-
-    // Editor selection without text processing, cardinality 1 (again).
-    $this->field_text_instance->settings['text_processing'] = 0;
-    $this->field_text_instance->save();
-    $this->assertEqual('plain_text', $this->getSelectedEditor($this->entity->id(), $field_name), "Without text processing again, cardinality 1, the 'plain_text' editor is selected.");
-
     // Editor selection without text processing, cardinality >1
     $this->field_text_field_storage->cardinality = 2;
     $this->field_text_field_storage->save();
     $this->assertEqual('form', $this->getSelectedEditor($this->entity->id(), $field_name), "Without text processing, cardinality >1, the 'form' editor is selected.");
-
-    // Editor selection with text processing, cardinality >1
-    $this->field_text_instance->settings['text_processing'] = 1;
-    $this->field_text_instance->save();
-    $this->assertEqual('form', $this->getSelectedEditor($this->entity->id(), $field_name), "With text processing, cardinality >1, the 'form' editor is selected.");
   }
 
   /**
@@ -112,7 +96,7 @@ public function testTextWysiwyg() {
     $this->createFieldWithInstance(
       $field_name, 'text', 1, 'Long text field',
       // Instance settings.
-      array('text_processing' => 1),
+      array(),
       // Widget type & settings.
       'text_textarea',
       array('size' => 42),
diff --git a/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php b/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php
index 5fd0425..c413455 100644
--- a/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php
+++ b/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php
@@ -62,16 +62,16 @@ protected function setUp() {
    */
   public function testSimpleEntityType() {
     $field_1_name = 'field_text';
-    $field_1_label = 'Simple text field';
+    $field_1_label = 'Plain text field';
     $this->createFieldWithInstance(
-      $field_1_name, 'text', 1, $field_1_label,
+      $field_1_name, 'string', 1, $field_1_label,
       // Instance settings.
-      array('text_processing' => 0),
+      array(),
       // Widget type & settings.
-      'text_textfield',
+      'string',
       array('size' => 42),
       // 'default' formatter type & settings.
-      'text_default',
+      'string',
       array()
     );
     $field_2_name = 'field_nr';
@@ -141,7 +141,7 @@ public function testEditorWithCustomMetadata() {
     $this->createFieldWithInstance(
       $field_name, 'text', 1, $field_label,
       // Instance settings.
-      array('text_processing' => 1),
+      array(),
       // Widget type & settings.
       'text_textfield',
       array('size' => 42),
diff --git a/core/modules/quickedit/tests/modules/src/Plugin/InPlaceEditor/WysiwygEditor.php b/core/modules/quickedit/tests/modules/src/Plugin/InPlaceEditor/WysiwygEditor.php
index 21c88b4..b916dcd 100644
--- a/core/modules/quickedit/tests/modules/src/Plugin/InPlaceEditor/WysiwygEditor.php
+++ b/core/modules/quickedit/tests/modules/src/Plugin/InPlaceEditor/WysiwygEditor.php
@@ -33,7 +33,7 @@ public function isCompatible(FieldItemListInterface $items) {
     // This editor is compatible with processed ("rich") text fields; but only
     // if there is a currently active text format and that text format is the
     // 'full_html' text format.
-    elseif ($field_definition->getSetting('text_processing')) {
+    elseif (in_array($field_definition->getType(), array('text', 'text_long', 'text_with_summary'))) {
       if ($items[0]->format === 'full_html') {
         return TRUE;
       }
diff --git a/core/modules/system/src/Tests/Entity/EntityFieldTest.php b/core/modules/system/src/Tests/Entity/EntityFieldTest.php
index 5d5b9e4..20cccd5 100644
--- a/core/modules/system/src/Tests/Entity/EntityFieldTest.php
+++ b/core/modules/system/src/Tests/Entity/EntityFieldTest.php
@@ -614,11 +614,6 @@ public function testComputedProperties() {
    *   The entity type to run the tests with.
    */
   protected function assertComputedProperties($entity_type) {
-    // Make the test text field processed.
-    $instance = FieldInstanceConfig::loadByName($entity_type, $entity_type, 'field_test_text');
-    $instance->settings['text_processing'] = 1;
-    $instance->save();
-
     $entity = $this->createTestEntity($entity_type);
     $entity->field_test_text->value = "The <strong>text</strong> text to filter.";
     $entity->field_test_text->format = filter_default_format();
diff --git a/core/modules/taxonomy/src/Entity/Term.php b/core/modules/taxonomy/src/Entity/Term.php
index 8796e83..7be2c94 100644
--- a/core/modules/taxonomy/src/Entity/Term.php
+++ b/core/modules/taxonomy/src/Entity/Term.php
@@ -138,7 +138,6 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields['description'] = FieldDefinition::create('text_long')
       ->setLabel(t('Description'))
       ->setDescription(t('A description of the term.'))
-      ->setSetting('text_processing', 1)
       ->setDisplayOptions('view', array(
         'label' => 'hidden',
         'type' => 'text_default',
diff --git a/core/modules/text/config/schema/text.schema.yml b/core/modules/text/config/schema/text.schema.yml
index dc54670..9934257 100644
--- a/core/modules/text/config/schema/text.schema.yml
+++ b/core/modules/text/config/schema/text.schema.yml
@@ -19,10 +19,8 @@ field.text.settings:
 field.text.instance_settings:
   type: mapping
   label: 'Text settings'
-  mapping:
-    text_processing:
-      type: integer
-      label: 'Text processing'
+  sequence:
+    - type: string
 
 field.text.value:
   type: sequence
@@ -46,11 +44,9 @@ field.text_long.settings:
 
 field.text_long.instance_settings:
   type: mapping
-  label: 'Long text settings'
-  mapping:
-    text_processing:
-      type: string
-      label: 'Text processing'
+  label: 'Filtered long text settings'
+  sequence:
+    - type: string
 
 field.text_long.value:
   type: sequence
@@ -76,9 +72,6 @@ field.text_with_summary.instance_settings:
   type: mapping
   label: 'Text area with a summary'
   mapping:
-    text_processing:
-      type: boolean
-      label: 'Text processing'
     display_summary:
       type: boolean
       label: 'Summary input'
@@ -102,7 +95,7 @@ field.text_with_summary.value:
 
 entity_view_display.field.text_default:
   type: entity_field_view_display_base
-  label: 'Text default display format settings'
+  label: 'Filtered text default display format settings'
   mapping:
     settings:
       type: sequence
@@ -112,7 +105,7 @@ entity_view_display.field.text_default:
 
 entity_view_display.field.text_summary_or_trimmed:
   type: entity_field_view_display_base
-  label: 'Summary or trimmed text display format settings'
+  label: 'Summary or trimmed filtered text display format settings'
   mapping:
     settings:
       type: mapping
diff --git a/core/modules/text/src/Plugin/Field/FieldFormatter/TextDefaultFormatter.php b/core/modules/text/src/Plugin/Field/FieldFormatter/TextDefaultFormatter.php
index cfd83dc..9577c2f 100644
--- a/core/modules/text/src/Plugin/Field/FieldFormatter/TextDefaultFormatter.php
+++ b/core/modules/text/src/Plugin/Field/FieldFormatter/TextDefaultFormatter.php
@@ -32,25 +32,6 @@ class TextDefaultFormatter extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items) {
-    if ($this->getFieldSetting('text_processing')) {
-      return $this->viewElementsWithTextProcessing($items);
-    }
-    else {
-      return $this->viewElementsWithoutTextProcessing($items);
-    }
-  }
-
-  /**
-   * Builds a renderable array when text processing is enabled.
-   *
-   * @param \Drupal\Core\Field\FieldItemListInterface $items
-   *   The text field values to be rendered.
-   *
-   * @return array
-   *   A renderable array for $items, as an array of child elements keyed by
-   *   consecutive numeric indexes starting from 0.
-   */
-  protected function viewElementsWithTextProcessing(FieldItemListInterface $items) {
     $elements = array();
 
     foreach ($items as $delta => $item) {
@@ -77,26 +58,4 @@ protected function viewElementsWithTextProcessing(FieldItemListInterface $items)
     return $elements;
   }
 
-  /**
-   * Builds a renderable array when text processing is disabled.
-   *
-   * @param \Drupal\Core\Field\FieldItemListInterface $items
-   *   The text field values to be rendered.
-   *
-   * @return array
-   *   A renderable array for $items, as an array of child elements keyed by
-   *   consecutive numeric indexes starting from 0.
-   */
-  protected function viewElementsWithoutTextProcessing(FieldItemListInterface $items) {
-    $elements = array();
-
-    foreach ($items as $delta => $item) {
-      $elements[$delta] = array(
-        '#markup' => $item->processed,
-      );
-    }
-
-    return $elements;
-  }
-
 }
diff --git a/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php b/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
index 8cd66c0..4e24c98 100644
--- a/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
+++ b/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
@@ -69,25 +69,6 @@ public function settingsSummary() {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items) {
-    if ($this->getFieldSetting('text_processing')) {
-      return $this->viewElementsWithTextProcessing($items);
-    }
-    else {
-      return $this->viewElementsWithoutTextProcessing($items);
-    }
-  }
-
-  /**
-   * Builds a renderable array when text processing is enabled.
-   *
-   * @param \Drupal\Core\Field\FieldItemListInterface $items
-   *   The text field values to be rendered.
-   *
-   * @return array
-   *   A renderable array for $items, as an array of child elements keyed by
-   *   consecutive numeric indexes starting from 0.
-   */
-  protected function viewElementsWithTextProcessing(FieldItemListInterface $items) {
     $elements = array();
 
     foreach ($items as $delta => $item) {
@@ -124,33 +105,4 @@ protected function viewElementsWithTextProcessing(FieldItemListInterface $items)
     return $elements;
   }
 
-  /**
-   * Builds a renderable array when text processing is disabled.
-   *
-   * @param \Drupal\Core\Field\FieldItemListInterface $items
-   *   The text field values to be rendered.
-   *
-   * @return array
-   *   A renderable array for $items, as an array of child elements keyed by
-   *   consecutive numeric indexes starting from 0.
-   */
-  protected function viewElementsWithoutTextProcessing(FieldItemListInterface $items) {
-    $elements = array();
-
-    foreach ($items as $delta => $item) {
-      if ($this->getPluginId() == 'text_summary_or_trimmed' && !empty($item->summary)) {
-        $output = $item->summary_processed;
-      }
-      else {
-        $output = text_summary($item->processed, NULL, $this->getSetting('trim_length'));
-      }
-
-      $elements[$delta] = array(
-        '#markup' => $output,
-      );
-    }
-
-    return $elements;
-  }
-
 }
diff --git a/core/modules/text/src/Plugin/Field/FieldType/TextItem.php b/core/modules/text/src/Plugin/Field/FieldType/TextItem.php
index 3b7285d..4a86e05 100644
--- a/core/modules/text/src/Plugin/Field/FieldType/TextItem.php
+++ b/core/modules/text/src/Plugin/Field/FieldType/TextItem.php
@@ -15,7 +15,7 @@
  *
  * @FieldType(
  *   id = "text",
- *   label = @Translation("Text"),
+ *   label = @Translation("Filtered text"),
  *   description = @Translation("This field stores varchar text in the database."),
  *   default_widget = "text_textfield",
  *   default_formatter = "text_default"
@@ -95,23 +95,4 @@ public function settingsForm(array &$form, FormStateInterface $form_state, $has_
     return $element;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function instanceSettingsForm(array $form, FormStateInterface $form_state) {
-    $element = array();
-
-    $element['text_processing'] = array(
-      '#type' => 'radios',
-      '#title' => t('Text processing'),
-      '#default_value' => $this->getSetting('text_processing'),
-      '#options' => array(
-        t('Plain text'),
-        t('Filtered text (user selects text format)'),
-      ),
-    );
-
-    return $element;
-  }
-
 }
diff --git a/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php b/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php
index ca1769d..f19c727 100644
--- a/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php
+++ b/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php
@@ -19,15 +19,6 @@
   /**
    * {@inheritdoc}
    */
-  public static function defaultInstanceSettings() {
-    $settings = parent::defaultInstanceSettings();
-    $settings['text_processing'] = 0;
-    return $settings;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     $properties['value'] = DataDefinition::create('string')
       ->setLabel(t('Text value'));
diff --git a/core/modules/text/src/Plugin/Field/FieldType/TextLongItem.php b/core/modules/text/src/Plugin/Field/FieldType/TextLongItem.php
index 1c74a41..27c90b9 100644
--- a/core/modules/text/src/Plugin/Field/FieldType/TextLongItem.php
+++ b/core/modules/text/src/Plugin/Field/FieldType/TextLongItem.php
@@ -15,7 +15,7 @@
  *
  * @FieldType(
  *   id = "text_long",
- *   label = @Translation("Long text"),
+ *   label = @Translation("Filtered long text"),
  *   description = @Translation("This field stores long text in the database."),
  *   default_widget = "text_textarea",
  *   default_formatter = "text_default"
@@ -46,23 +46,4 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
     );
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function instanceSettingsForm(array $form, FormStateInterface $form_state) {
-    $element = array();
-
-    $element['text_processing'] = array(
-      '#type' => 'radios',
-      '#title' => t('Text processing'),
-      '#default_value' => $this->getSetting('text_processing'),
-      '#options' => array(
-        t('Plain text'),
-        t('Filtered text (user selects text format)'),
-      ),
-    );
-
-    return $element;
-  }
-
 }
diff --git a/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php b/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php
index 7ffcd64..db0a5cd 100644
--- a/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php
+++ b/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php
@@ -16,7 +16,7 @@
  *
  * @FieldType(
  *   id = "text_with_summary",
- *   label = @Translation("Long text and summary"),
+ *   label = @Translation("Filtered ong text and summary"),
  *   description = @Translation("This field stores long text in the database along with optional summary text."),
  *   default_widget = "text_textarea_with_summary",
  *   default_formatter = "text_default"
@@ -29,7 +29,6 @@ class TextWithSummaryItem extends TextItemBase {
    */
   public static function defaultInstanceSettings() {
     return array(
-      'text_processing' => 1,
       'display_summary' => 0,
     ) + parent::defaultInstanceSettings();
   }
@@ -96,15 +95,6 @@ public function instanceSettingsForm(array $form, FormStateInterface $form_state
     $element = array();
     $settings = $this->getSettings();
 
-    $element['text_processing'] = array(
-      '#type' => 'radios',
-      '#title' => t('Text processing'),
-      '#default_value' => $settings['text_processing'],
-      '#options' => array(
-        t('Plain text'),
-        t('Filtered text (user selects text format)'),
-      ),
-    );
     $element['display_summary'] = array(
       '#type' => 'checkbox',
       '#title' => t('Summary input'),
diff --git a/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php b/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php
index ef6a5db..0ac3151 100644
--- a/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php
+++ b/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php
@@ -31,15 +31,11 @@ class TextareaWidget extends StringTextareaWidget {
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
     $main_widget = parent::formElement($items, $delta, $element, $form, $form_state);
 
-    if ($this->getFieldSetting('text_processing')) {
-      $element = $main_widget['value'];
-      $element['#type'] = 'text_format';
-      $element['#format'] = $items[$delta]->format;
-      $element['#base_type'] = $main_widget['value']['#type'];
-      return $element;
-    }
-
-    return $main_widget;
+    $element = $main_widget['value'];
+    $element['#type'] = 'text_format';
+    $element['#format'] = $items[$delta]->format;
+    $element['#base_type'] = $main_widget['value']['#type'];
+    return $element;
   }
 
   /**
diff --git a/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php b/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php
index c9b5dcd..6bf39f8 100644
--- a/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php
+++ b/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php
@@ -32,14 +32,11 @@ class TextfieldWidget extends StringWidget {
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
     $main_widget = parent::formElement($items, $delta, $element, $form, $form_state);
 
-    if ($this->getFieldSetting('text_processing')) {
-      $element = $main_widget['value'];
-      $element['#type'] = 'text_format';
-      $element['#format'] = isset($items[$delta]->format) ? $items[$delta]->format : NULL;
-      $element['#base_type'] = $main_widget['value']['#type'];
-      return $element;
-    }
-    return $main_widget;
+    $element = $main_widget['value'];
+    $element['#type'] = 'text_format';
+    $element['#format'] = isset($items[$delta]->format) ? $items[$delta]->format : NULL;
+    $element['#base_type'] = $main_widget['value']['#type'];
+    return $element;
   }
 
   /**
diff --git a/core/modules/text/src/Tests/Formatter/TextFormatterTest.php b/core/modules/text/src/Tests/Formatter/TextFormatterTest.php
index b9ba45a..e95c42b 100644
--- a/core/modules/text/src/Tests/Formatter/TextFormatterTest.php
+++ b/core/modules/text/src/Tests/Formatter/TextFormatterTest.php
@@ -66,24 +66,6 @@ public function setUp() {
       'bundle' => $this->bundle,
       'field_name' => 'processed_text',
       'label' => 'Processed text',
-      'settings' => array(
-        'text_processing' => TRUE,
-      ),
-    ))->save();
-    entity_create('field_storage_config', array(
-      'name' => 'unprocessed_text',
-      'entity_type' => $this->entityType,
-      'type' => 'text',
-      'settings' => array(),
-    ))->save();
-    entity_create('field_instance_config', array(
-      'entity_type' => $this->entityType,
-      'bundle' => $this->bundle,
-      'field_name' => 'unprocessed_text',
-      'label' => 'Unprocessed text',
-      'settings' => array(
-        'text_processing' => FALSE,
-      ),
     ))->save();
   }
 
@@ -103,9 +85,6 @@ public function testFormatters() {
       'value' => 'Hello, world!',
       'format' => 'my_text_format',
     );
-    $entity->unprocessed_text = array(
-      'value' => 'Hello, world!',
-    );
     $entity->save();
 
     foreach ($formatters as $formatter) {
@@ -116,12 +95,6 @@ public function testFormatters() {
         'filter_format' => array('my_text_format' => 'my_text_format'),
       );
       $this->assertEqual($build[0]['#cache']['tags'], $expected_cache_tags, format_string('The @formatter formatter has the expected cache tags when formatting a processed text field.', array('@formatter' => $formatter)));
-
-      // Verify the unprocessed text field formatter's render array.
-      $build = $entity->get('unprocessed_text')->view(array('type' => $formatter));
-      debug($build[0]);
-      $this->assertEqual($build[0]['#markup'], 'Hello, world!');
-      $this->assertTrue(!isset($build[0]['#cache']), format_string('The @formatter formatter has the expected cache tags when formatting an unprocessed text field.', array('@formatter' => $formatter)));
     }
   }
 
diff --git a/core/modules/text/src/Tests/Formatter/TextPlainUnitTest.php b/core/modules/text/src/Tests/Formatter/TextPlainUnitTest.php
index 327e318..e7460ef 100644
--- a/core/modules/text/src/Tests/Formatter/TextPlainUnitTest.php
+++ b/core/modules/text/src/Tests/Formatter/TextPlainUnitTest.php
@@ -47,9 +47,6 @@ function setUp() {
     $this->field_name = drupal_strtolower($this->randomName());
     $this->field_type = 'text_long';
     $this->field_settings = array();
-    $this->instance_settings = array(
-      'text_processing' => FALSE,
-    );
 
     $this->formatter_type = 'string';
     $this->formatter_settings = array();
diff --git a/core/modules/text/src/Tests/TextFieldTest.php b/core/modules/text/src/Tests/TextFieldTest.php
index aee7022..8827d37 100644
--- a/core/modules/text/src/Tests/TextFieldTest.php
+++ b/core/modules/text/src/Tests/TextFieldTest.php
@@ -96,9 +96,6 @@ function _testTextfieldWidgets($field_type, $widget_type) {
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
       'label' => $this->randomName() . '_label',
-      'settings' => array(
-        'text_processing' => TRUE,
-      ),
     ))->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
       ->setComponent($field_name, array(
@@ -162,9 +159,6 @@ function _testTextfieldWidgetsFormatted($field_type, $widget_type) {
       'field_storage' => $field_storage,
       'bundle' => 'entity_test',
       'label' => $this->randomName() . '_label',
-      'settings' => array(
-        'text_processing' => TRUE,
-      ),
     ))->save();
     entity_get_form_display('entity_test', 'entity_test', 'default')
       ->setComponent($field_name, array(
diff --git a/core/modules/text/src/Tests/TextWithSummaryItemTest.php b/core/modules/text/src/Tests/TextWithSummaryItemTest.php
index 67cbec5..cde8117 100644
--- a/core/modules/text/src/Tests/TextWithSummaryItemTest.php
+++ b/core/modules/text/src/Tests/TextWithSummaryItemTest.php
@@ -72,18 +72,8 @@ public function testCrudAndUpdate() {
     $this->assertTrue($entity->summary_field instanceof FieldItemListInterface, 'Field implements interface.');
     $this->assertTrue($entity->summary_field[0] instanceof FieldItemInterface, 'Field item implements interface.');
     $this->assertEqual($entity->summary_field->value, $value);
-    $this->assertEqual($entity->summary_field->processed, $value);
     $this->assertEqual($entity->summary_field->summary, $summary);
-    $this->assertEqual($entity->summary_field->summary_processed, $summary);
     $this->assertNull($entity->summary_field->format);
-
-    // Enable text processing.
-    $this->instance->settings['text_processing'] = 1;
-    $this->instance->save();
-
-    // Re-load the entity.
-    $entity = entity_load($entity_type, $entity->id(), TRUE);
-
     // Even if no format is given, if text processing is enabled, the default
     // format is used.
     $this->assertEqual($entity->summary_field->processed, "<p>$value</p>\n");
@@ -115,9 +105,6 @@ protected function createField($entity_type) {
     $this->instance = entity_create('field_instance_config', array(
       'field_storage' => $this->fieldStorage,
       'bundle' => $entity_type,
-      'settings' => array(
-        'text_processing' => 0,
-      )
     ));
     $this->instance->save();
   }
diff --git a/core/modules/text/src/TextProcessed.php b/core/modules/text/src/TextProcessed.php
index 321962b..d06ce01 100644
--- a/core/modules/text/src/TextProcessed.php
+++ b/core/modules/text/src/TextProcessed.php
@@ -55,13 +55,8 @@ public function getValue($langcode = NULL) {
     if (!isset($text) || $text === '') {
       $this->processed = '';
     }
-    elseif ($item->getFieldDefinition()->getSetting('text_processing')) {
-      $this->processed = check_markup($text, $item->format, $item->getLangcode());
-    }
     else {
-      // Escape all HTML and retain newlines.
-      // @see \Drupal\Core\Field\Plugin\Field\FieldFormatter\StringFormatter
-      $this->processed = SafeMarkup::set(nl2br(String::checkPlain($text)));
+      $this->processed = check_markup($text, $item->format, $item->getLangcode());
     }
     return $this->processed;
   }
diff --git a/core/modules/text/text.module b/core/modules/text/text.module
index 1612487..96dcd8f 100644
--- a/core/modules/text/text.module
+++ b/core/modules/text/text.module
@@ -157,12 +157,3 @@ function text_summary($text, $format = NULL, $size = NULL) {
 
   return $summary;
 }
-
-/**
- * Implements hook_field_formatter_info_alter().
- */
-function text_field_formatter_info_alter(&$info) {
-  $info['string']['field_types'][] = 'text';
-  $info['string']['field_types'][] = 'text_with_summary';
-  $info['string']['field_types'][] = 'text_long';
-}