diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp
index 308df6b4439..5db930ab6db 100644
--- a/mozilla/layout/html/table/src/nsTableFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableFrame.cpp
@@ -4113,11 +4113,6 @@ nscoord nsTableFrame::CalcBorderBoxHeight(const nsHTMLReflowState& aState,
 
   if (eStyleUnit_Auto == aState.mStylePosition->mHeight.GetUnit()) {
     isAutoHeight = PR_TRUE;
-    if (NS_UNCONSTRAINEDSIZE != aState.availableHeight) {
-      nsMargin margin(0,0,0,0);
-      aState.mStyleSpacing->GetMargin(margin);
-      height = aState.availableHeight - margin.top - margin.bottom;
-    }
   }
   else if (((0 == height) || (NS_UNCONSTRAINEDSIZE == height)) &&
            aDoNavHack && (eStyleUnit_Percent == aState.mStylePosition->mHeight.GetUnit())) {
diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp
index 308df6b4439..5db930ab6db 100644
--- a/mozilla/layout/tables/nsTableFrame.cpp
+++ b/mozilla/layout/tables/nsTableFrame.cpp
@@ -4113,11 +4113,6 @@ nscoord nsTableFrame::CalcBorderBoxHeight(const nsHTMLReflowState& aState,
 
   if (eStyleUnit_Auto == aState.mStylePosition->mHeight.GetUnit()) {
     isAutoHeight = PR_TRUE;
-    if (NS_UNCONSTRAINEDSIZE != aState.availableHeight) {
-      nsMargin margin(0,0,0,0);
-      aState.mStyleSpacing->GetMargin(margin);
-      height = aState.availableHeight - margin.top - margin.bottom;
-    }
   }
   else if (((0 == height) || (NS_UNCONSTRAINEDSIZE == height)) &&
            aDoNavHack && (eStyleUnit_Percent == aState.mStylePosition->mHeight.GetUnit())) {