diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm
index cdcd1b54aa..c6798adbad 100644
--- a/AsyncDisplayKit/ASDisplayNode.mm
+++ b/AsyncDisplayKit/ASDisplayNode.mm
@@ -2172,15 +2172,7 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock)
     return;
   }
   
-  if ([[self class] usesImplicitHierarchyManagement]) {
-    [self __layoutSublayouts];
-  } else {
-    // Assume that _layout was flattened and is 1-level deep.
-    for (ASLayout *subnodeLayout in _layout.sublayouts) {
-      ASDisplayNodeAssert([_subnodes containsObject:subnodeLayout.layoutableObject], @"Sublayouts must only contain subnodes' layout. self = %@, subnodes = %@", self, _subnodes);
-      ((ASDisplayNode *)subnodeLayout.layoutableObject).frame = [subnodeLayout frame];
-    }
-  }
+  [self __layoutSublayouts];
 }
 
 - (void)__layoutSublayouts
diff --git a/AsyncDisplayKit/_ASTransitionContext.m b/AsyncDisplayKit/_ASTransitionContext.m
index 5a6d1e08d4..bb599f894a 100644
--- a/AsyncDisplayKit/_ASTransitionContext.m
+++ b/AsyncDisplayKit/_ASTransitionContext.m
@@ -42,7 +42,7 @@
 
 - (CGRect)finalFrameForNode:(ASDisplayNode *)node
 {
-  for (ASLayout *layout in _layout.immediateSublayouts) {
+  for (ASLayout *layout in _layout.sublayouts) {
     if (layout.layoutableObject == node) {
       return [layout frame];
     }