--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -30,9 +30,9 @@ refresh contents of top applied patch   
 '''
 
 from mercurial.demandload import *
+from mercurial.i18n import gettext as _
 demandload(globals(), "os sys re struct traceback errno bz2")
-from mercurial.i18n import gettext as _
-from mercurial import ui, hg, revlog, commands, util
+demandload(globals(), "mercurial:commands,hg,revlog,ui,util")
 
 commands.norepo += " qclone qversion"