diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index f5daf3e..10b73d3 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -791,7 +791,10 @@
     PipedJob *PJ = dyn_cast<PipedJob>(Dest);
     if (!PJ) {
       PJ = new PipedJob();
-      cast<JobList>(Dest)->addJob(PJ);
+      // FIXME: Temporary hack so that -ccc-print-bindings work until
+      // we have pipe support. Please remove later.
+      if (!CCCPrintBindings)
+        cast<JobList>(Dest)->addJob(PJ);
       Dest = PJ;
     }
     Result = InputInfo(PJ, A->getType(), BaseInput);