diff --git a/direct/src/dcparser/dcmsgtypes.h b/direct/src/dcparser/dcmsgtypes.h
index 4ceec6a0ca..7df1f1a6f5 100644
--- a/direct/src/dcparser/dcmsgtypes.h
+++ b/direct/src/dcparser/dcmsgtypes.h
@@ -36,6 +36,7 @@
 #define STATESERVER_OBJECT_GENERATE_WITH_REQUIRED         2001
 #define STATESERVER_OBJECT_GENERATE_WITH_REQUIRED_OTHER   2003
 #define STATESERVER_OBJECT_UPDATE_FIELD                   2004
+#define STATESERVER_BOUNCE_MESSAGE                        2086
 
 // CMU messages:
 #define CLIENT_OBJECT_GENERATE_CMU                        9002
diff --git a/direct/src/distributed/cConnectionRepository.cxx b/direct/src/distributed/cConnectionRepository.cxx
index 771be2f5b9..1730f71591 100644
--- a/direct/src/distributed/cConnectionRepository.cxx
+++ b/direct/src/distributed/cConnectionRepository.cxx
@@ -303,23 +303,12 @@ check_datagram() {
       return true;
     }
 
-    unsigned int client_update_msg;
-    unsigned int stateserver_update_msg;
-    if (astron_support)
-    {
-      client_update_msg = CLIENT_OBJECT_SET_FIELD;
-      stateserver_update_msg = STATESERVER_OBJECT_SET_FIELD;
-    }
-    else
-    {
-      client_update_msg = CLIENT_OBJECT_UPDATE_FIELD;
-      stateserver_update_msg = STATESERVER_OBJECT_UPDATE_FIELD;
-    }
-
     switch (_msg_type) {
 #ifdef HAVE_PYTHON
-    case client_update_msg:
-    case stateserver_update_msg:
+    case CLIENT_OBJECT_SET_FIELD:
+    case CLIENT_OBJECT_UPDATE_FIELD:
+    case STATESERVER_OBJECT_SET_FIELD:
+    case STATESERVER_OBJECT_UPDATE_FIELD:
       if (_handle_c_updates) {
         if (_has_owner_view) {
           if (!handle_update_field_owner()) {