         var bold:Boolean = (fontWeight == "bold");
         var italic:Boolean = (fontStyle == "italic");
 
-        // Save for hasFontContextChanged().
-        oldEmbeddedFontContext = getFontContext(fontName, bold, italic);
+        var className:String = getQualifiedClassName(classObj);
         
-        var moduleContext:IFlexModuleFactory = oldEmbeddedFontContext ?
-                                               oldEmbeddedFontContext :
-                                               moduleFactory;
-                                                    
-        var className:String = getQualifiedClassName(classObj);
-
         // If the caller requests a UITextField,
         // we may actually return a UITLFTextField,
         // depending on the version number

     *  where an object wanting to  use the font should be created.
     */
    mx_internal function getFontContext(fontName:String, bold:Boolean,
                                        italic:Boolean):IFlexModuleFactory
    {
        if (noEmbeddedFonts) 
            return null;

        var italic:Boolean = fontStyle == "italic";
        var fontContext:IFlexModuleFactory = noEmbeddedFonts ? null : 
            embeddedFontRegistry.getAssociatedModuleFactory(
                fontName, bold, italic, this, moduleFactory,
                systemManager);
        return fontContext != oldEmbeddedFontContext;
    }

