--- a/src/faces.c	Wed Feb 24 01:58:04 2010 -0600
+++ b/src/faces.c	Wed Feb 24 19:04:27 2010 -0600
@@ -724,7 +724,7 @@
 
 void
 default_face_font_info (Lisp_Object domain, int *ascent, int *descent,
-			int *height, int *width, int *proportional_p)
+			int *width, int *height, int *proportional_p)
 {
   Lisp_Object font_instance;
   struct face_cachel *cachel;
@@ -783,25 +783,9 @@
 }
 
 void
-default_face_height_and_width (Lisp_Object domain,
-			       int *height, int *width)
-{
-  default_face_font_info (domain, 0, 0, height, width, 0);
-}
-
-void
-default_face_height_and_width_1 (Lisp_Object domain,
-				 int *height, int *width)
+default_face_width_and_height (Lisp_Object domain, int *width, int *height)
 {
-  if (window_system_pixelated_geometry (domain))
-    {
-      if (height)
-	*height = 1;
-      if (width)
-	*width = 1;
-    }
-  else
-    default_face_height_and_width (domain, height, width);
+  default_face_font_info (domain, 0, 0, width, height, 0);
 }
 
 DEFUN ("face-list", Fface_list, 0, 1, 0, /*