diff --git a/core/modules/node/lib/Drupal/node/NodeStorageController.php b/core/modules/node/lib/Drupal/node/NodeStorageController.php
index c9e832e..f1f8031 100644
--- a/core/modules/node/lib/Drupal/node/NodeStorageController.php
+++ b/core/modules/node/lib/Drupal/node/NodeStorageController.php
@@ -217,7 +217,7 @@ public function baseFieldDefinitions() {
     $properties['uuid'] = array(
       'label' => t('UUID'),
       'description' => t('The node UUID.'),
-      'type' => 'string_field',
+      'type' => 'uuid_field',
       'read-only' => TRUE,
     );
     $properties['vid'] = array(
diff --git a/core/modules/text/lib/Drupal/text/Type/TextItem.php b/core/modules/text/lib/Drupal/text/Type/TextItem.php
index 4017a9d..fecfaac 100644
--- a/core/modules/text/lib/Drupal/text/Type/TextItem.php
+++ b/core/modules/text/lib/Drupal/text/Type/TextItem.php
@@ -55,16 +55,9 @@ public function getPropertyDefinitions() {
    * Overrides \Drupal\Core\TypedData\TypedDataInterface::applyDefaultValue().
    */
   public function applyDefaultValue() {
-    $format = NULL;
-    if ($this->parent) {
-      $field = $this->parent;
-      $entity = $field->getParent();
-      $instance = field_info_instance($entity->entityType(), $field->getName(), $entity->bundle());
-      if ($instance['settings']['text_processing']) {
-        $format = filter_default_format();
-      }
-    }
-    $this->setValue(array('format' => $format));
+    // Default to a simple check_plain().
+    // @todo: Add in the filter default format here.
+    $this->setValue(array('format' => NULL));
     return $this;
   }