diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py
--- a/mercurial/changegroup.py
+++ b/mercurial/changegroup.py
@@ -6,9 +6,9 @@ changegroup.py - Mercurial changegroup m
 This software may be used and distributed according to the terms
 of the GNU General Public License, incorporated herein by reference.
 """
+
 from i18n import gettext as _
-from demandload import *
-demandload(globals(), "struct os bz2 zlib util tempfile")
+import struct, os, bz2, zlib, util, tempfile
 
 def getchunk(source):
     """get a chunk from a changegroup"""