diff --git a/bots/zephyr_mirror.py b/bots/zephyr_mirror.py
index 33b1830..1e5b1a6 100755
--- a/bots/zephyr_mirror.py
+++ b/bots/zephyr_mirror.py
@@ -39,7 +39,7 @@ if options.sync_subscriptions:
     subprocess.call(args)
     sys.exit(0)
 
-if options.forward_class_messages:
+if options.forward_class_messages and not options.noshard:
     sys.path.append("/home/humbug/humbug")
     from zephyr.lib.parallel import run_parallel
     print "Starting parallel zephyr class mirroring bot"
diff --git a/bots/zephyr_mirror_backend.py b/bots/zephyr_mirror_backend.py
index ca7d5b6..4def943 100755
--- a/bots/zephyr_mirror_backend.py
+++ b/bots/zephyr_mirror_backend.py
@@ -722,6 +722,10 @@ def parse_args():
                       action='store_true')
     parser.add_option('--shard',
                       help=optparse.SUPPRESS_HELP)
+    parser.add_option('--noshard',
+                      default=False,
+                      help=optparse.SUPPRESS_HELP,
+                      action='store_true')
     parser.add_option('--resend-log',
                       dest='resend_log_path',
                       help=optparse.SUPPRESS_HELP)