         // to be used for text measurement. The text field factory keeps
         // the text fields to one per moduleFactory.
         var embeddedFont:Boolean = false;
-        var fontModuleFactory:IFlexModuleFactory =
+        var fontModuleFactory:IFlexModuleFactory = (noEmbeddedFonts || !embeddedFontRegistry) ? 
+			null : 
             embeddedFontRegistry.getAssociatedModuleFactory(
-                getEmbeddedFont(font, bold, italic), moduleFactory);
+                font, bold, italic, this, moduleFactory);
 
         embeddedFont = (fontModuleFactory != null);
         if (fontModuleFactory == null)

     */
    private static function get embeddedFontRegistry():IEmbeddedFontRegistry
    {
        if (!_embeddedFontRegistry)
        {
            _embeddedFontRegistry = IEmbeddedFontRegistry(
                Singleton.getInstance("mx.core::IEmbeddedFontRegistry"));
        }

        return _embeddedFontRegistry;

     */
    private var systemManager:ISystemManager;
    
    //--------------------------------------------------------------------------
    //
    //  Properties
