                 // Go large.  For performance reasons, want to avoid a scrollRect 
                 // whenever possible in drawBackgroundAndSetScrollRect().  This is
                 // particularly true for 1 line TextInput components.
-                if (!isNaN(widthConstraint))
-                {
-                    measuredWidth = widthConstraint;
-                }
-                else
-                {                
-                    measuredWidth = !isNaN(explicitWidth) ? explicitWidth :
-                        Math.ceil(calculateWidthInChars());
-                }
-                
-                if (!isNaN(heightConstraint))
-                {            
-                    measuredHeight = heightConstraint;
-                }
-                else
-                {
-                    measuredHeight = !isNaN(explicitHeight) ? explicitHeight :
-                        Math.ceil(calculateHeightInLines());
-                }
+                measuredWidth = !isNaN(explicitWidth) ? explicitWidth :
+                    Math.ceil(calculateWidthInChars());
+                measuredHeight = !isNaN(explicitHeight) ? explicitHeight :
+                    Math.ceil(calculateHeightInLines());
             }
             else
             {

            }
            
            _textContainerManager.updateContainer();

            widthConstraint = NaN;
            heightConstraint = NaN;
        }
        
        /**
         *  @private
         */
        override public function setLayoutBoundsSize(
                                    width:Number, height:Number,
                                    postLayoutTransform:Boolean = true):void
        {
            // width and height are NaN unless there are constraints on them.
            // Save these so when we are auto-sizing we know which dimensions
            // are constrained.  Without this it is not possible to differentiate 
            // between a measured width/height that is the same as the
            // constrained width/height to know whether that dimension can
            // be sized or must be fixed at the constrained value.
            if (autoSize)
            {
                if (!isNaN(width))
                    widthConstraint = width;
                
                if (!isNaN(height))
                    heightConstraint = height;
            }
            
            super.setLayoutBoundsSize(width, height, postLayoutTransform);
        }
        

                // If so, the sizes are set so no need to remeasure now.
                if (!isNaN(explicitWidth) || !isNaN(_widthInChars))
                    return false;
            }                       
            
            // Width or height is different than what was measured.  Since we're
