--- a/mercurial/mdiff.py	Tue Dec 12 18:16:23 2006 -0600
+++ b/mercurial/mdiff.py	Wed Dec 13 13:27:09 2006 -0600
@@ -5,9 +5,7 @@
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
-from demandload import demandload
-import bdiff, mpatch
-demandload(globals(), "re struct util")
+import bdiff, mpatch, re, struct, util
 
 def splitnewlines(text):
     '''like str.splitlines, but only split on newlines.'''