diff --git a/core/lib/Drupal/Core/TypedData/Validation/EntityMetadata.php b/core/lib/Drupal/Core/TypedData/Validation/EntityMetadata.php
deleted file mode 100644
index d33de7a..0000000
--- a/core/lib/Drupal/Core/TypedData/Validation/EntityMetadata.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * @file
- * Contains EntityMetadata.php
- */
-
-namespace Drupal\Core\TypedData\Validation;
-
-use Symfony\Component\Validator\Mapping\CascadingStrategy;
-use Symfony\Component\Validator\Mapping\TraversalStrategy;
-
-/**
- * Defines a class for entity metadata.
- */
-class EntityMetadata extends PropertyContainerMetadata {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCascadingStrategy() {
-    return CascadingStrategy::CASCADE;
-  }
-
-}
diff --git a/core/lib/Drupal/Core/TypedData/Validation/Metadata.php b/core/lib/Drupal/Core/TypedData/Validation/Metadata.php
index ef72f8c..de45f39 100755
--- a/core/lib/Drupal/Core/TypedData/Validation/Metadata.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/Metadata.php
@@ -33,8 +33,8 @@ public function getConstrainedProperties() {
   /**
    * {@inheritdoc}
    */
-  public function hasPropertyMetadata($property_name) {
-    return [];
+  public function hasPropertyMetadata($property) {
+    return FALSE;
   }
 
   /**
diff --git a/core/lib/Drupal/Core/TypedData/Validation/MetadataFactory.php b/core/lib/Drupal/Core/TypedData/Validation/MetadataFactory.php
index b2cdcaa..aac6c84 100755
--- a/core/lib/Drupal/Core/TypedData/Validation/MetadataFactory.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/MetadataFactory.php
@@ -32,9 +32,6 @@ public function getMetadataFor($typed_data) {
     if ($typed_data instanceof ComplexDataInterface || $typed_data instanceof ListInterface) {
       $class = '\Drupal\Core\TypedData\Validation\PropertyContainerMetadata';
     }
-    if ($typed_data instanceof EntityAdapter) {
-      $class = '\Drupal\Core\TypedData\Validation\EntityMetadata';
-    }
     return new $class($typed_data, $this);
   }
 
diff --git a/core/lib/Drupal/Core/TypedData/Validation/PropertyContainerMetadata.php b/core/lib/Drupal/Core/TypedData/Validation/PropertyContainerMetadata.php
index 52f7ab2..059f047 100644
--- a/core/lib/Drupal/Core/TypedData/Validation/PropertyContainerMetadata.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/PropertyContainerMetadata.php
@@ -13,6 +13,7 @@
 use Drupal\Core\TypedData\PrimitiveInterface;
 use Drupal\Core\TypedData\TypedDataInterface;
 use Drupal\Core\Validation\Plugin\Validation\Constraint\ComplexDataConstraint;
+use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Exception\BadMethodCallException;
 use Symfony\Component\Validator\Mapping\CascadingStrategy;
 use Symfony\Component\Validator\Mapping\TraversalStrategy;
@@ -50,7 +51,7 @@ public function __construct(TypedDataInterface $typed_data, MetadataFactory $fac
    * {@inheritdoc}
    */
   public function findConstraints($group) {
-    return $this->getConstraints();
+    return $this->constraints;
   }
 
   /**
@@ -131,21 +132,14 @@ public function getConstrainedProperties() {
    * {@inheritdoc}
    */
   public function getCascadingStrategy() {
-    // If we have property constraints, we need to cascade.
-    if ($this->propertyConstraints) {
-      return CascadingStrategy::CASCADE;
+    foreach ($this->getConstrainedProperties() as $property_name) {
+      foreach ($this->getPropertyMetadata($property_name) as $metadata) {
+        if ($metadata->findConstraints(Constraint::DEFAULT_GROUP)) {
+          return CascadingStrategy::CASCADE;
+        }
+      }
     }
     return CascadingStrategy::NONE;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getTraversalStrategy() {
-    if ($this->typedData instanceof ListInterface) {
-      return TraversalStrategy::IMPLICIT;
-    }
-    return parent::getTraversalStrategy();
-  }
-
 }