diff --git a/direct/src/distributed/ClientRepository.py b/direct/src/distributed/ClientRepository.py
index b9380ceecf..a4a5be2c30 100644
--- a/direct/src/distributed/ClientRepository.py
+++ b/direct/src/distributed/ClientRepository.py
@@ -316,12 +316,11 @@ class ClientRepository(ConnectionRepository):
         # Update the required fields
         distObj.generateInit()  # Only called when constructed
         distObj.generate()
-        if not wantGlobalManagers:
-            if wantOtpServer:
-                # TODO: ROGER: where should we get parentId and zoneId?
-                parentId = None
-                zoneId = None
-                distObj.setLocation(parentId, zoneId)
+        if wantOtpServer:
+            # TODO: ROGER: where should we get parentId and zoneId?
+            parentId = None
+            zoneId = None
+            distObj.setLocation(parentId, zoneId)
         # updateRequiredFields calls announceGenerate
         return  distObj
 
diff --git a/direct/src/distributed/ConnectionRepository.py b/direct/src/distributed/ConnectionRepository.py
index 56c0fed5ef..fd66a2a714 100644
--- a/direct/src/distributed/ConnectionRepository.py
+++ b/direct/src/distributed/ConnectionRepository.py
@@ -59,58 +59,31 @@ class ConnectionRepository(
         # DC file.  The AIRepository will redefine this to 'AI'.
         self.dcSuffix = ''
 
-    if wantGlobalManagers:
-        def generateGlobalObject(self, doId, dcname):
-            # Look up the dclass
-            dclass = self.dclassesByName[dcname+self.dcSuffix]
-            # Create a new distributed object, and put it in the dictionary
-            #distObj = self.generateWithRequiredFields(dclass, doId, di)
+    def generateGlobalObject(self, doId, dcname):
+        # Look up the dclass
+        dclass = self.dclassesByName[dcname+self.dcSuffix]
+        # Create a new distributed object, and put it in the dictionary
+        #distObj = self.generateWithRequiredFields(dclass, doId, di)
 
-            # Construct a new one
-            classDef = dclass.getClassDef()
-            if classDef == None:
-                self.notify.error("Could not create an undefined %s object."%(
-                    dclass.getName()))
-            distObj = classDef(self)
-            distObj.dclass = dclass
-            # Assign it an Id
-            distObj.doId = doId
-            # Put the new do in the dictionary
-            self.doId2do[doId] = distObj
-            # Update the required fields
-            distObj.generateInit()  # Only called when constructed
-            distObj.generate()
-            distObj.announceGenerate()
-            distObj.parentId = 0
-            distObj.zoneId = 0
-            # updateRequiredFields calls announceGenerate
-            return  distObj
-
-        ## def generateGlobalObject(self, doId, dcname, parentId=None, zoneId=None):
-            ## assert self.notify.debugStateCall(self)
-            ## # Look up the dclass
-            ## dclass = self.dclassesByName[dcname]
-            ## # Construct a new one
-            ## classDef = dclass.getClassDef()
-            ## if classDef == None:
-                ## self.notify.error("Could not create an undefined %s object."%(
-                    ## dclass.getName()))
-            ## distObj = classDef(self)
-            ## distObj.dclass = dclass
-            
-            ## assert not hasattr(self, 'parentId')
-            ## self.doId = doId
-            ## self.parentId = parentId
-            ## self.zoneId = zoneId
-            ## # Put the new DO in the dictionaries
-            ## self.air.addDOToTables(self, location=(parentId,zoneId))
-
-            ## assert not hasattr(self, 'parentId')
-            ## self.parentId = parentId
-            ## self.zoneId = zoneId
-            ## distObj.generateInit()  # Only called when constructed
-            ## self.generate()
-            ## return  distObj
+        # Construct a new one
+        classDef = dclass.getClassDef()
+        if classDef == None:
+            self.notify.error("Could not create an undefined %s object."%(
+                dclass.getName()))
+        distObj = classDef(self)
+        distObj.dclass = dclass
+        # Assign it an Id
+        distObj.doId = doId
+        # Put the new do in the dictionary
+        self.doId2do[doId] = distObj
+        # Update the required fields
+        distObj.generateInit()  # Only called when constructed
+        distObj.generate()
+        distObj.announceGenerate()
+        distObj.parentId = 0
+        distObj.zoneId = 0
+        # updateRequiredFields calls announceGenerate
+        return  distObj
 
     def readDCFile(self, dcFileNames = None):
         """