diff --git a/React/Base/Surface/RCTSurface.mm b/React/Base/Surface/RCTSurface.mm
index 9624663af..c67ba985c 100644
--- a/React/Base/Surface/RCTSurface.mm
+++ b/React/Base/Surface/RCTSurface.mm
@@ -15,6 +15,7 @@
 #import "RCTAssert.h"
 #import "RCTBridge+Private.h"
 #import "RCTBridge.h"
+#import "RCTShadowView+Layout.h"
 #import "RCTSurfaceDelegate.h"
 #import "RCTSurfaceRootShadowView.h"
 #import "RCTSurfaceRootShadowViewDelegate.h"
diff --git a/React/Base/Surface/RCTSurfaceRootShadowView.h b/React/Base/Surface/RCTSurfaceRootShadowView.h
index f681e67eb..86b12c393 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowView.h
+++ b/React/Base/Surface/RCTSurfaceRootShadowView.h
@@ -22,9 +22,6 @@
 
 @property (nonatomic, weak) id<RCTSurfaceRootShadowViewDelegate> delegate;
 
-- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize
-                      maximumSize:(CGSize)maximumSize;
-
 /**
  * Layout direction (LTR or RTL) inherited from native environment and
  * is using as a base direction value in layout engine.
diff --git a/React/Base/Surface/RCTSurfaceRootShadowView.m b/React/Base/Surface/RCTSurfaceRootShadowView.m
index 3b98c6d79..2c762fa65 100644
--- a/React/Base/Surface/RCTSurfaceRootShadowView.m
+++ b/React/Base/Surface/RCTSurfaceRootShadowView.m
@@ -76,41 +76,6 @@
   return viewsWithNewFrame;
 }
 
-- (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize
-                      maximumSize:(CGSize)maximumSize
-{
-  // Positive case where requested constraind are aready enforced.
-  if (CGSizeEqualToSize(minimumSize, _minimumSize) &&
-      CGSizeEqualToSize(maximumSize, _maximumSize)) {
-    // We stil need to call `calculateLayoutWithMinimumSize:maximumSize`
-    // mehtod though.
-    [self calculateLayoutWithMinimumSize:_minimumSize
-                             maximumSize:_maximumSize];
-
-    YGNodeRef yogaNode = self.yogaNode;
-    return CGSizeMake(YGNodeLayoutGetWidth(yogaNode), YGNodeLayoutGetHeight(yogaNode));
-  }
-
-  // Generic case, where requested constraind are different from enforced.
-
-  // Applying given size constraints.
-  [self calculateLayoutWithMinimumSize:minimumSize
-                           maximumSize:maximumSize];
-
-  YGNodeRef yogaNode = self.yogaNode;
-  CGSize fittingSize =
-    CGSizeMake(YGNodeLayoutGetWidth(yogaNode), YGNodeLayoutGetHeight(yogaNode));
-
-  // Reverting size constraints.
-  [self calculateLayoutWithMinimumSize:_minimumSize
-                           maximumSize:_maximumSize];
-
-  return CGSizeMake(
-    MAX(minimumSize.width, MIN(maximumSize.width, fittingSize.width)),
-    MAX(minimumSize.height, MIN(maximumSize.height, fittingSize.height))
-  );
-}
-
 - (void)setMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize
 {
   if (CGSizeEqualToSize(minimumSize, _minimumSize) &&