diff --git a/core/modules/contact/lib/Drupal/contact/Entity/Message.php b/core/modules/contact/lib/Drupal/contact/Entity/Message.php
index 8303372..4fd8446 100644
--- a/core/modules/contact/lib/Drupal/contact/Entity/Message.php
+++ b/core/modules/contact/lib/Drupal/contact/Entity/Message.php
@@ -184,7 +184,7 @@ public static function baseFieldDefinitions($entity_type) {
       ))
       ->setDisplayConfigurable('form', TRUE)
       ->setDisplayOptions('view', array(
-        'type' => 'text_default',
+        'type' => 'text_plain',
         'weight' => 0,
         'label' => 'hidden',
       ))
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php b/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php
index d661ff1..f89fd08 100644
--- a/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php
+++ b/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php
@@ -20,7 +20,7 @@ class ContactSitewideTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('text', 'contact', 'field_ui');
+  public static $modules = array('contact', 'field_ui');
 
   public static function getInfo() {
     return array(