diff --git a/CSSLayout/CSSLayout.c b/CSSLayout/CSSLayout.c
index f4d3a68c..7a5766ed 100644
--- a/CSSLayout/CSSLayout.c
+++ b/CSSLayout/CSSLayout.c
@@ -451,8 +451,6 @@ print_css_node_rec(const CSSNodeRef node, const CSSPrintOptions options, const u
       printf("overflow: 'hidden', ");
     } else if (node->style.overflow == CSSOverflowVisible) {
       printf("overflow: 'visible', ");
-    } else if (node->style.overflow == CSSOverflowScroll) {
-      printf("overflow: 'scroll', ");
     }
 
     if (four_equal(node->style.margin)) {
@@ -557,7 +555,8 @@ static bool isColumnDirection(const CSSFlexDirection flexDirection) {
 }
 
 static float getLeadingMargin(const CSSNodeRef node, const CSSFlexDirection axis) {
-  if (isRowDirection(axis) && !CSSValueIsUndefined(node->style.margin[CSSEdgeStart])) {
+  if (isRowDirection(axis) &&
+      !CSSValueIsUndefined(node->style.margin[CSSEdgeStart])) {
     return node->style.margin[CSSEdgeStart];
   }
 
@@ -565,7 +564,8 @@ static float getLeadingMargin(const CSSNodeRef node, const CSSFlexDirection axis
 }
 
 static float getTrailingMargin(const CSSNodeRef node, const CSSFlexDirection axis) {
-  if (isRowDirection(axis) && !CSSValueIsUndefined(node->style.margin[CSSEdgeEnd])) {
+  if (isRowDirection(axis) &&
+      !CSSValueIsUndefined(node->style.margin[CSSEdgeEnd])) {
     return node->style.margin[CSSEdgeEnd];
   }
 
@@ -573,7 +573,8 @@ static float getTrailingMargin(const CSSNodeRef node, const CSSFlexDirection axi
 }
 
 static float getLeadingPadding(const CSSNodeRef node, const CSSFlexDirection axis) {
-  if (isRowDirection(axis) && !CSSValueIsUndefined(node->style.padding[CSSEdgeStart]) &&
+  if (isRowDirection(axis) &&
+      !CSSValueIsUndefined(node->style.padding[CSSEdgeStart]) &&
       node->style.padding[CSSEdgeStart] >= 0) {
     return node->style.padding[CSSEdgeStart];
   }
@@ -586,7 +587,8 @@ static float getLeadingPadding(const CSSNodeRef node, const CSSFlexDirection axi
 }
 
 static float getTrailingPadding(const CSSNodeRef node, const CSSFlexDirection axis) {
-  if (isRowDirection(axis) && !CSSValueIsUndefined(node->style.padding[CSSEdgeEnd]) &&
+  if (isRowDirection(axis) &&
+      !CSSValueIsUndefined(node->style.padding[CSSEdgeEnd]) &&
       node->style.padding[CSSEdgeEnd] >= 0) {
     return node->style.padding[CSSEdgeEnd];
   }
@@ -599,7 +601,8 @@ static float getTrailingPadding(const CSSNodeRef node, const CSSFlexDirection ax
 }
 
 static float getLeadingBorder(const CSSNodeRef node, const CSSFlexDirection axis) {
-  if (isRowDirection(axis) && !CSSValueIsUndefined(node->style.border[CSSEdgeStart]) &&
+  if (isRowDirection(axis) &&
+      !CSSValueIsUndefined(node->style.border[CSSEdgeStart]) &&
       node->style.border[CSSEdgeStart] >= 0) {
     return node->style.border[CSSEdgeStart];
   }
@@ -612,7 +615,8 @@ static float getLeadingBorder(const CSSNodeRef node, const CSSFlexDirection axis
 }
 
 static float getTrailingBorder(const CSSNodeRef node, const CSSFlexDirection axis) {
-  if (isRowDirection(axis) && !CSSValueIsUndefined(node->style.border[CSSEdgeEnd]) &&
+  if (isRowDirection(axis) &&
+      !CSSValueIsUndefined(node->style.border[CSSEdgeEnd]) &&
       node->style.border[CSSEdgeEnd] >= 0) {
     return node->style.border[CSSEdgeEnd];
   }
@@ -1136,17 +1140,21 @@ static void layoutNodeImpl(const CSSNodeRef node,
           childHeightMeasureMode = CSSMeasureModeExactly;
         }
 
-        // The W3C spec doesn't say anything about the 'overflow' property,
-        // but all major browsers appear to implement the following logic.
-        if ((!isMainAxisRow && node->style.overflow == CSSOverflowScroll) || node->style.overflow != CSSOverflowScroll) {
-          if (CSSValueIsUndefined(childWidth) && !CSSValueIsUndefined(availableInnerWidth)) {
-            childWidth = availableInnerWidth;
-            childWidthMeasureMode = CSSMeasureModeAtMost;
-          }
+        // According to the spec, if the main size is not definite and the
+        // child's inline axis is parallel to the main axis (i.e. it's
+        // horizontal), the child should be sized using "UNDEFINED" in
+        // the main size. Otherwise use "AT_MOST" in the cross axis.
+        if (!isMainAxisRow && CSSValueIsUndefined(childWidth) &&
+            !CSSValueIsUndefined(availableInnerWidth)) {
+          childWidth = availableInnerWidth;
+          childWidthMeasureMode = CSSMeasureModeAtMost;
         }
 
-        if ((isMainAxisRow && node->style.overflow == CSSOverflowScroll) || node->style.overflow != CSSOverflowScroll) {
-          if (CSSValueIsUndefined(childHeight) && !CSSValueIsUndefined(availableInnerHeight)) {
+        // The W3C spec doesn't say anything about the 'overflow' property,
+        // but all major browsers appear to implement the following logic.
+        if (node->style.overflow == CSSOverflowHidden) {
+          if (isMainAxisRow && CSSValueIsUndefined(childHeight) &&
+              !CSSValueIsUndefined(availableInnerHeight)) {
             childHeight = availableInnerHeight;
             childHeightMeasureMode = CSSMeasureModeAtMost;
           }
diff --git a/CSSLayout/CSSLayout.h b/CSSLayout/CSSLayout.h
index 539b8ab0..3ebce685 100644
--- a/CSSLayout/CSSLayout.h
+++ b/CSSLayout/CSSLayout.h
@@ -55,7 +55,6 @@ typedef enum CSSJustify {
 typedef enum CSSOverflow {
   CSSOverflowVisible,
   CSSOverflowHidden,
-  CSSOverflowScroll,
 } CSSOverflow;
 
 // Note: auto is only a valid value for alignSelf. It is NOT a valid value for
diff --git a/java/com/facebook/csslayout/CSSOverflow.java b/java/com/facebook/csslayout/CSSOverflow.java
index 9aae8225..29957a9a 100644
--- a/java/com/facebook/csslayout/CSSOverflow.java
+++ b/java/com/facebook/csslayout/CSSOverflow.java
@@ -12,5 +12,4 @@ package com.facebook.csslayout;
 public enum CSSOverflow {
   VISIBLE,
   HIDDEN,
-  SCROLL,
 }
diff --git a/java/com/facebook/csslayout/LayoutEngine.java b/java/com/facebook/csslayout/LayoutEngine.java
index 57336949..b8edf8f9 100644
--- a/java/com/facebook/csslayout/LayoutEngine.java
+++ b/java/com/facebook/csslayout/LayoutEngine.java
@@ -715,17 +715,19 @@ public class LayoutEngine {
             childHeightMeasureMode = CSSMeasureMode.EXACTLY;
           }
 
-          // The W3C spec doesn't say anything about the 'overflow' property,
-          // but all major browsers appear to implement the following logic.
-          if ((!isMainAxisRow && node.style.overflow == CSSOverflow.SCROLL) || node.style.overflow != CSSOverflow.SCROLL) {
-            if (Float.isNaN(childWidth) && !Float.isNaN(availableInnerWidth)) {
-              childWidth = availableInnerWidth;
-              childWidthMeasureMode = CSSMeasureMode.AT_MOST;
-            }
+          // According to the spec, if the main size is not definite and the
+          // child's inline axis is parallel to the main axis (i.e. it's
+          // horizontal), the child should be sized using "UNDEFINED" in
+          // the main size. Otherwise use "AT_MOST" in the cross axis.
+          if (!isMainAxisRow && Float.isNaN(childWidth) && !Float.isNaN(availableInnerWidth)) {
+            childWidth = availableInnerWidth;
+            childWidthMeasureMode = CSSMeasureMode.AT_MOST;
           }
 
-          if ((isMainAxisRow && node.style.overflow == CSSOverflow.SCROLL) || node.style.overflow != CSSOverflow.SCROLL) {
-            if (Float.isNaN(childHeight) && !Float.isNaN(availableInnerHeight)) {
+          // The W3C spec doesn't say anything about the 'overflow' property,
+          // but all major browsers appear to implement the following logic.
+          if (node.style.overflow == CSSOverflow.HIDDEN) {
+            if (isMainAxisRow && Float.isNaN(childHeight) && !Float.isNaN(availableInnerHeight)) {
               childHeight = availableInnerHeight;
               childHeightMeasureMode = CSSMeasureMode.AT_MOST;
             }