diff --git a/test/Driver/ccc-add-args.c b/test/Driver/ccc-add-args.c
deleted file mode 100644
index 171bfd285484de1eb22953e74f6cb049eca68349..0000000000000000000000000000000000000000
--- a/test/Driver/ccc-add-args.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// RUN: env CCC_ADD_ARGS="-ccc-print-options,,-v" %clang -### 2>&1 | FileCheck %s
-// CHECK: Option 0 - Name: "-ccc-print-options", Values: {}
-// CHECK: Option 1 - Name: "-v", Values: {}
-// CHECK: Option 2 - Name: "-###", Values: {}
diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
index 7ad3d0ab40bf47d6bd47f7ac6f278cdad5ce96e5..ac062fb0b5475516f795cd9e6e6fc604f7027e62 100644
--- a/tools/driver/driver.cpp
+++ b/tools/driver/driver.cpp
@@ -323,25 +323,6 @@ int main(int argc_, const char **argv_) {
   if (const char *OverrideStr = ::getenv("QA_OVERRIDE_GCC3_OPTIONS")) {
     // FIXME: Driver shouldn't take extra initial argument.
     ApplyQAOverride(argv, OverrideStr, SavedStrings);
-  } else if (const char *Cur = ::getenv("CCC_ADD_ARGS")) {
-    // FIXME: Driver shouldn't take extra initial argument.
-    std::vector<const char*> ExtraArgs;
-
-    for (;;) {
-      const char *Next = strchr(Cur, ',');
-
-      if (Next) {
-        ExtraArgs.push_back(SaveStringInSet(SavedStrings,
-                                            std::string(Cur, Next)));
-        Cur = Next + 1;
-      } else {
-        if (*Cur != '\0')
-          ExtraArgs.push_back(SaveStringInSet(SavedStrings, Cur));
-        break;
-      }
-    }
-
-    argv.insert(&argv[1], ExtraArgs.begin(), ExtraArgs.end());
   }
 
   std::string Path = GetExecutablePath(argv[0], CanonicalPrefixes);