--- a/git/cinnabar-debug-push.py
+++ b/git/cinnabar-debug-push.py
@@ -12,19 +12,20 @@ from binascii import hexlify
 import json
 import sys
 
 import cinnabar.util
 from cinnabar.hg import (
     get_ui,
     push,
 )
-from cinnabar.bundle import (
-    PushStore,
-)
+try:
+    from cinnabar.hg.bundle import PushStore
+except ImportError:
+    from cinnabar.bundle import PushStore
 
 try:
     from cinnabar.util import init_logging
 except ImportError:
     def init_logging(): pass
 
 try:
     from cinnabar.hg import (