--- Individual.php.orig	2009-10-24 02:33:31.000000000 +0900
+++ Individual.php.new	2009-12-26 02:33:08.000000000 +0900
@@ -161,11 +161,7 @@
         }
         
         if ( $lastName || $firstName || $middleName ) {
-            if ( $lastName && $firstName ) {
-                $contact->sort_name    = trim( "$lastName, $firstName" );
-            } else {
-                $contact->sort_name    = trim( "$lastName $firstName" );
-            }
+            $contact->sort_name    = trim( "$firstName $lastName" );
 
             $display_name =
                 trim( "$prefix $firstName $middleName $lastName $suffix" );