diff -r 259ba7502370 -r b28004513977 hgext/rebase.py
--- a/hgext/rebase.py	Sun Jun 12 17:26:20 2011 +0300
+++ b/hgext/rebase.py	Sun Jun 12 17:26:58 2011 +0300
@@ -396,14 +396,9 @@
                 mq.qimport(repo, (), patchname=name, git=isgit,
                                 rev=[str(state[rev])])
 
-        # Restore missing guards
-        for s in original_series:
-            pname = mq.guard_re.split(s, 1)[0]
-            if pname in mq.fullseries:
-                repo.ui.debug('restoring guard for patch %s' % (pname))
-                mq.fullseries.remove(pname)
-                mq.fullseries.append(s)
-                mq.series_dirty = True
+        # restore old series to preserve guards
+        mq.fullseries = original_series
+        mq.series_dirty = True
         mq.savedirty()
 
 def storestatus(repo, originalwd, target, state, collapse, keep, keepbranches,