                                                     
         if (clipAndEnableScrollingChanged)
         {
-            // Not sure if there is any real difference between on and auto.
             // The TLF code seems to check for !off.
-            if (_clipAndEnableScrolling)
-            {
-                _textContainerManager.horizontalScrollPolicy = "on";
-                _textContainerManager.verticalScrollPolicy = "on";
-            }
-            else
-            {
-                _textContainerManager.horizontalScrollPolicy = "auto";
-                _textContainerManager.verticalScrollPolicy = "auto";
-            }
+            _textContainerManager.horizontalScrollPolicy = "auto";
+            _textContainerManager.verticalScrollPolicy = "auto";
+            
             clipAndEnableScrollingChanged = false;
         }
         

        clipAndEnableScrollingChanged = true;
        
        invalidateProperties();
        invalidateDisplayList();
    }
        
    //----------------------------------

        verticalScrollPositionChanged = true;

        invalidateProperties();
        
        // Note:  TLF takes care of updating the container when the scroll
        // position is set so there is no need for us to invalidate the 
        // display list.
    }
        
    //--------------------------------------------------------------------------
