diff --git a/xwords4/common/server.c b/xwords4/common/server.c
index 4e286c801..2f3d57959 100644
--- a/xwords4/common/server.c
+++ b/xwords4/common/server.c
@@ -965,20 +965,30 @@ readGuestAddrs( ServerCtxt* server, XWStreamCtxt* stream )
             server->nv.rematch.addrs = XP_MALLOC( server->mpool, len );
             stream_getBytes( stream, server->nv.rematch.addrs, len );
             XP_LOGFF( "loaded %d bytes of rematch.addrs", len );
-        }
 #ifdef DEBUG
-        XWStreamCtxt* tmpStream = mkServerStream( server );
-        stream_setVersion( tmpStream, stream_getVersion( stream ) );
-        stream_putBytes( tmpStream, server->nv.rematch.addrs,
-                         server->nv.rematch.addrsLen );
-        while ( 0 < stream_getSize(tmpStream) ) {
-            CommsAddrRec addr = {0};
-            addrFromStream( &addr, tmpStream );
-            XP_LOGFF( "got an address" );
-            logAddr( server->vol.dutil, &addr, __func__ );
-        }
-        stream_destroy( tmpStream );
+            XWStreamCtxt* tmpStream = mkServerStream( server );
+            stream_setVersion( tmpStream, version );
+            stream_putBytes( tmpStream, server->nv.rematch.addrs,
+                             server->nv.rematch.addrsLen );
+
+            if ( STREAM_VERS_REMATCHORDER <= version ) {
+                RematchInfo ri;
+                ri_fromStream( &ri, tmpStream, server );
+                for ( int ii = 0; ii < ri.nAddrs; ++ii ) {
+                    XP_LOGFF( "got an address" );
+                    logAddr( server->vol.dutil, &ri.addrs[ii], __func__ );
+                }
+            } else {
+                while ( 0 < stream_getSize(tmpStream) ) {
+                    CommsAddrRec addr = {0};
+                    addrFromStream( &addr, tmpStream );
+                    XP_LOGFF( "got an address" );
+                    logAddr( server->vol.dutil, &addr, __func__ );
+                }
+            }
+            stream_destroy( tmpStream );
 #endif
+        }
     }
     LOG_RETURN_VOID();
 }
diff --git a/xwords4/linux/scripts/netGamesTest.py b/xwords4/linux/scripts/netGamesTest.py
index 4cf09e2f0..9d80a1812 100755
--- a/xwords4/linux/scripts/netGamesTest.py
+++ b/xwords4/linux/scripts/netGamesTest.py
@@ -5,7 +5,7 @@ import argparse, datetime, json, os, random, shutil, signal, \
 
 g_NAMES = ['Brynn', 'Ariela', 'Kati', 'Eric']
 # These must correspond to what the linux app is looking for in roFromStr()
-g_ROS = ['same', 'low_score_first', 'high_score_first', 'juggle', 'by_name',]
+g_ROS = ['same', 'low_score_first', 'high_score_first', 'juggle',]
 gDone = False
 gGamesMade = 0
 g_LOGFILE = None