diff --git a/ChangeLog b/ChangeLog
index 708e3e04a..79429925f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-17 Riccardo Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSFont.m: Revert incorrect matrix equality test change.
+
 2007-05-16 Riccardo Frith-Macdonald <rfm@gnu.org>
 
 	* Headers/AppKit/NSFontDescriptor.h: tidied indentation etc.
diff --git a/Source/NSFont.m b/Source/NSFont.m
index 33e247c74..e8263ef02 100644
--- a/Source/NSFont.m
+++ b/Source/NSFont.m
@@ -857,22 +857,14 @@ static void setNSFont(NSString *key, NSFont *font)
 
 - (BOOL) isEqual: (id)anObject
 {
-  NSAffineTransformStruct	ats;
-
   if (anObject == self)
     return YES;
   if ([anObject isKindOfClass: self->isa] == NO)
     return NO;
   if ([[anObject fontName] isEqual: fontName] == NO)
     return NO;
-  ats = [[(NSFontDescriptor*)anObject matrix] transformStruct];
-  if (ats.m11 != matrix[0]) return NO;
-  if (ats.m12 != matrix[1]) return NO;
-  if (ats.m21 != matrix[2]) return NO;
-  if (ats.m22 != matrix[3]) return NO;
-  if (ats.tX != matrix[4]) return NO;
-  if (ats.tY != matrix[5]) return NO;
-
+  if (memcmp(matrix, [(NSFont*)anObject matrix], sizeof(matrix)) != 0)
+    return NO;
   return YES;
 }