diff --git a/src/solaris/classes/sun/awt/X11/XFontPeer.java b/src/solaris/classes/sun/awt/X11/XFontPeer.java
index 62044ace53e842b5413d38d3df4a25c2662de788..3d03a2503aad61123924dd169c63e6e00ebcde6f 100644
--- a/src/solaris/classes/sun/awt/X11/XFontPeer.java
+++ b/src/solaris/classes/sun/awt/X11/XFontPeer.java
@@ -27,9 +27,6 @@ package sun.awt.X11;
 import sun.awt.PlatformFont;
 import java.awt.GraphicsEnvironment;
 
-/* FIX ME */
-import sun.awt.motif.MFontConfiguration;
-
 public class XFontPeer extends PlatformFont {
 
     /*
@@ -51,10 +48,6 @@ public class XFontPeer extends PlatformFont {
 
     public XFontPeer(String name, int style){
         super(name, style);
-
-        if (fontConfig != null){
-            xfsname = ((MFontConfiguration) fontConfig).getMotifFontSet(familyName, style);
-        }
     }
 
     protected char getMissingGlyphCharacter() {
diff --git a/src/solaris/classes/sun/font/FcFontConfiguration.java b/src/solaris/classes/sun/font/FcFontConfiguration.java
index 95154df0a47b550cda0f7e519d6aff2768d2866c..a34fed02e156fd5f4ea8852ee09a541976a5835c 100644
--- a/src/solaris/classes/sun/font/FcFontConfiguration.java
+++ b/src/solaris/classes/sun/font/FcFontConfiguration.java
@@ -173,7 +173,7 @@ public class FcFontConfiguration extends FontConfiguration {
 
     @Override
     public FontDescriptor[] getFontDescriptors(String fontName, int style) {
-        throw new InternalError("Not implemented");
+        return new FontDescriptor[0];
     }
 
     @Override