diff --git a/composer.json b/composer.json
index 49bc768..4c0f43c 100644
--- a/composer.json
+++ b/composer.json
@@ -8,6 +8,7 @@
     "sdboyer/gliph": "0.1.*",
     "symfony/class-loader": "2.6.*",
     "symfony/css-selector": "2.6.*",
+    "symfony/debug": "2.6.*",
     "symfony/dependency-injection": "2.6.*",
     "symfony/event-dispatcher": "2.6.*",
     "symfony/http-foundation": "2.6.*",
diff --git a/composer.lock b/composer.lock
index 7b8706b..c5627d5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "f42dce2268b1a6fcf8ffc8720c45f28f",
+    "hash": "fce47406c708047e654d8274620405e8",
     "packages": [
         {
             "name": "doctrine/annotations",
diff --git a/core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml b/core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml
index dea2bba..6cea289 100644
--- a/core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml
+++ b/core/modules/action/tests/action_bulk_test/config/install/views.view.test_bulk_form.yml
@@ -173,7 +173,7 @@ display:
         area:
           id: area
           table: views
-          field: area_text_custom
+          field: area
           empty: true
           content: 'This view is empty.'
           plugin_id: text_custom
diff --git a/core/modules/image/src/Entity/ImageStyle.php b/core/modules/image/src/Entity/ImageStyle.php
index 32e5d3b..0b4f515 100644
--- a/core/modules/image/src/Entity/ImageStyle.php
+++ b/core/modules/image/src/Entity/ImageStyle.php
@@ -66,14 +66,14 @@ class ImageStyle extends ConfigEntityBase implements ImageStyleInterface, Entity
    *
    * @var string
    */
-  public $name;
+  protected $name;
 
   /**
    * The image style label.
    *
    * @var string
    */
-  public $label;
+  protected $label;
 
   /**
    * The array of image effects for this image style.
@@ -99,6 +99,22 @@ public function id() {
   /**
    * {@inheritdoc}
    */
+  public function label() {
+    return $this->get('label');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setLabel($label) {
+    $this->set('label', $label);
+    return $this;
+  }
+
+
+  /**
+   * {@inheritdoc}
+   */
   public function postSave(EntityStorageInterface $storage, $update = TRUE) {
     parent::postSave($storage, $update);
 
diff --git a/core/modules/node/config/install/views.view.frontpage.yml b/core/modules/node/config/install/views.view.frontpage.yml
index 312110b..4799f22 100644
--- a/core/modules/node/config/install/views.view.frontpage.yml
+++ b/core/modules/node/config/install/views.view.frontpage.yml
@@ -34,7 +34,7 @@ display:
           relationship: none
           table: views
           tokenize: false
-          plugin_id: text_custom
+          plugin_id: text
         node_listing_empty:
           admin_label: ''
           empty: true
diff --git a/core/modules/system/src/Entity/Action.php b/core/modules/system/src/Entity/Action.php
index a7176db..ca3d8cf 100644
--- a/core/modules/system/src/Entity/Action.php
+++ b/core/modules/system/src/Entity/Action.php
@@ -34,14 +34,14 @@ class Action extends ConfigEntityBase implements ActionConfigEntityInterface, En
    *
    * @var string
    */
-  public $id;
+  protected $id;
 
   /**
    * The label of the action.
    *
    * @var string
    */
-  public $label;
+  protected $label;
 
   /**
    * The action type.
diff --git a/core/modules/text/config/schema/text.data_types.schema.yml b/core/modules/text/config/schema/text.data_types.schema.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/core/modules/views/config/schema/views.area.schema.yml b/core/modules/views/config/schema/views.area.schema.yml
index 255be47..b75deb1 100644
--- a/core/modules/views/config/schema/views.area.schema.yml
+++ b/core/modules/views/config/schema/views.area.schema.yml
@@ -26,8 +26,11 @@ views.area.text:
   label: 'Text'
   mapping:
     content:
-      type: text_format
-      label: 'The formatted text of the area'
+      type: text
+      label: 'The shown text of the area'
+    format:
+      type: string
+      label: 'The filter format the content is in'
     tokenize:
       type: boolean
       label: 'Should replacement tokens be used from the first row'
diff --git a/core/modules/views/src/Plugin/views/area/Text.php b/core/modules/views/src/Plugin/views/area/Text.php
index a8d9555..29da4bc 100644
--- a/core/modules/views/src/Plugin/views/area/Text.php
+++ b/core/modules/views/src/Plugin/views/area/Text.php
@@ -23,12 +23,8 @@ class Text extends TokenizeAreaPluginBase {
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
-    $options['content'] = array(
-      'contains' => array(
-        'value' => array('default' => ''),
-        'format' => array('default' => NULL),
-      ),
-    );
+    $options['content'] = array('default' => '', 'format_key' => 'format');
+    $options['format'] = array('default' => NULL);
     return $options;
   }
 
@@ -41,9 +37,9 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     $form['content'] = array(
       '#title' => $this->t('Content'),
       '#type' => 'text_format',
-      '#default_value' => $this->options['content']['value'],
+      '#default_value' => $this->options['content'],
       '#rows' => 6,
-      '#format' => isset($this->options['content']['format']) ? $this->options['content']['format'] : filter_default_format(),
+      '#format' => isset($this->options['format']) ? $this->options['format'] : filter_default_format(),
       '#editor' => FALSE,
     );
   }
@@ -51,12 +47,22 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
   /**
    * {@inheritdoc}
    */
+  public function submitOptionsForm(&$form, FormStateInterface $form_state) {
+    $content = $form_state->getValue(array('options', 'content'));
+    $form_state->setValue(array('options', 'format'), $content['format']);
+    $form_state->setValue(array('options', 'content'), $content['value']);
+    parent::submitOptionsForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function render($empty = FALSE) {
-    $format = isset($this->options['content']['format']) ? $this->options['content']['format'] : filter_default_format();
+    $format = isset($this->options['format']) ? $this->options['format'] : filter_default_format();
     if (!$empty || !empty($this->options['empty'])) {
       return array(
         '#type' => 'processed_text',
-        '#text' => $this->tokenizeValue($this->options['content']['value']),
+        '#text' => $this->tokenizeValue($this->options['content']),
         '#format' => $format,
       );
     }
diff --git a/core/modules/views/src/Tests/Handler/AreaTextTest.php b/core/modules/views/src/Tests/Handler/AreaTextTest.php
index 5387a6e..d0eaf14 100644
--- a/core/modules/views/src/Tests/Handler/AreaTextTest.php
+++ b/core/modules/views/src/Tests/Handler/AreaTextTest.php
@@ -45,20 +45,18 @@ public function testAreaText() {
         'id' => 'area',
         'table' => 'views',
         'field' => 'area',
-        'content' => array(
-          'value' => $string,
-        ),
+        'content' => $string,
       ),
     ));
 
     // Execute the view.
     $this->executeView($view);
 
-    $view->display_handler->handlers['header']['area']->options['content']['format'] = $this->randomString();
+    $view->display_handler->handlers['header']['area']->options['format'] = $this->randomString();
     $build = $view->display_handler->handlers['header']['area']->render();
     $this->assertEqual('', drupal_render($build), 'Nonexistent format should return empty markup.');
 
-    $view->display_handler->handlers['header']['area']->options['content']['format'] = filter_default_format();
+    $view->display_handler->handlers['header']['area']->options['format'] = filter_default_format();
     $build = $view->display_handler->handlers['header']['area']->render();
     $this->assertEqual(check_markup($string), drupal_render($build), 'Existent format should return something');