diff --git a/lib/controller/controller.py b/lib/controller/controller.py
index 6932070cd..a05adf049 100644
--- a/lib/controller/controller.py
+++ b/lib/controller/controller.py
@@ -96,6 +96,10 @@ def start():
     if not conf.start:
         return
 
+    if conf.optimize:
+        conf.useCommonPrediction = conf.useNullConnection = True
+
+
     if conf.smokeTest:
         smokeTest()
 
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index 1f37c64f4..3092a7b8c 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -467,6 +467,9 @@ def cmdLineParser():
         parser.add_option("--null-connection", dest="useNullConnection", action="store_true",
                           help=SUPPRESS_HELP)
 
+        parser.add_option("-o", dest="optimize", action="store_true",
+                          help=SUPPRESS_HELP)
+
         parser.add_option("--smoke-test", dest="smokeTest", action="store_true",
                           help=SUPPRESS_HELP)