diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index ff9170cda698..ccd72d0420de 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -252,12 +252,6 @@ nsHTMLImageLoader::GetDesiredSize(nsIPresContext* aPresContext,
     fixedContentHeight = PR_FALSE;
   }
 
- //~~~
-  if(aDesiredSize.width == NS_UNCONSTRAINEDSIZE)
-    fixedContentWidth = PR_FALSE;
-  if(aDesiredSize.height == NS_UNCONSTRAINEDSIZE)
-    fixedContentHeight = PR_FALSE;
-
   // Choose reflow size
   if (fixedContentWidth || fixedContentHeight) {
     if (fixedContentWidth && fixedContentHeight) {
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 1a0f6ead9594..27672837ad57 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -666,12 +666,6 @@ nsObjectFrame::Reflow(nsIPresContext&          aPresContext,
 
     nsReflowStatus status;
 
-    if(PR_TRUE)//reflowReason == eReflowReason_Initial)
-    {
-      kidDesiredSize.width = NS_UNCONSTRAINEDSIZE;
-      kidDesiredSize.height = NS_UNCONSTRAINEDSIZE;
-    }
-
     ReflowChild(child, aPresContext, kidDesiredSize, kidReflowState, status);
 
     nsRect rect(0, 0, kidDesiredSize.width, kidDesiredSize.height);
diff --git a/layout/html/base/src/nsImageFrame.cpp b/layout/html/base/src/nsImageFrame.cpp
index ff9170cda698..ccd72d0420de 100644
--- a/layout/html/base/src/nsImageFrame.cpp
+++ b/layout/html/base/src/nsImageFrame.cpp
@@ -252,12 +252,6 @@ nsHTMLImageLoader::GetDesiredSize(nsIPresContext* aPresContext,
     fixedContentHeight = PR_FALSE;
   }
 
- //~~~
-  if(aDesiredSize.width == NS_UNCONSTRAINEDSIZE)
-    fixedContentWidth = PR_FALSE;
-  if(aDesiredSize.height == NS_UNCONSTRAINEDSIZE)
-    fixedContentHeight = PR_FALSE;
-
   // Choose reflow size
   if (fixedContentWidth || fixedContentHeight) {
     if (fixedContentWidth && fixedContentHeight) {
diff --git a/layout/html/base/src/nsObjectFrame.cpp b/layout/html/base/src/nsObjectFrame.cpp
index 1a0f6ead9594..27672837ad57 100644
--- a/layout/html/base/src/nsObjectFrame.cpp
+++ b/layout/html/base/src/nsObjectFrame.cpp
@@ -666,12 +666,6 @@ nsObjectFrame::Reflow(nsIPresContext&          aPresContext,
 
     nsReflowStatus status;
 
-    if(PR_TRUE)//reflowReason == eReflowReason_Initial)
-    {
-      kidDesiredSize.width = NS_UNCONSTRAINEDSIZE;
-      kidDesiredSize.height = NS_UNCONSTRAINEDSIZE;
-    }
-
     ReflowChild(child, aPresContext, kidDesiredSize, kidReflowState, status);
 
     nsRect rect(0, 0, kidDesiredSize.width, kidDesiredSize.height);