         // Finally, we'll add the in-line styles
         // to the head of the proto chain.
         inheritingStyles = styleDeclaration ?
-            addStyleDeclarationToProtoChain(inheritChain, this) :     // modified original code here
+            styleDeclaration.addStyleToProtoChain(inheritChain, this) :
             inheritChain;
         
         nonInheritingStyles = styleDeclaration ?
-            addStyleDeclarationToProtoChain(nonInheritChain, this) :  // modified original code here
+            styleDeclaration.addStyleToProtoChain(nonInheritChain, this) :
             nonInheritChain;
     }
-    
-    /**
-     *  @private
+        
+    /**
+     *  @copy mx.core.UIComponent#clearStyle()
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10
+     *  @playerversion AIR 2.5
+     *  @productversion Flex 4.5
      */
     public function clearStyle(styleProp:String):void
     {

    
    import mx.core.DesignLayer;
    import mx.core.IFlexDisplayObject;
    import mx.core.IToolTip;
    import mx.core.mx_internal;
    import mx.events.FlexEvent;

        dispatchChangeEvent("labelChanged");
    }
    
    //----------------------------------
    //  moduleFactory
    //----------------------------------

    /**
     *  @private
     */
    override public function set moduleFactory(factory:IFlexModuleFactory):void
    {
        super.moduleFactory = factory;        
        
        // Now that the module has been set, set any deferred styles.
        if (deferredSetStyles)
        {
            for (var styleProp:String in deferredSetStyles)
                StyleProtoChain.setStyle(this, styleProp, deferredSetStyles[styleProp]);
            
            deferredSetStyles = null;
        }
    }

    //----------------------------------
    //  text
    //----------------------------------

    /**
     *  @private
     *  Inherited version of this method calls validateNow().  We do not, since GridLayout will.  We're 
