diff --git a/docs/tools/clang.pod b/docs/tools/clang.pod
index abecd1c..704cc87 100644
--- a/docs/tools/clang.pod
+++ b/docs/tools/clang.pod
@@ -407,13 +407,6 @@
 
 Show commands to run and use verbose output.
 
-=item B<--working-directory>
-
-Use the given argument as the effective working directory to run the compiler
-in. This is useful for running the compiler as if in a specific working
-directory without the overhead of having to change directory using an auxiliary
-process.
-
 =back
 
 
diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
index 770b7d8..3f48b96 100644
--- a/include/clang/Driver/Options.td
+++ b/include/clang/Driver/Options.td
@@ -855,8 +855,6 @@
 def _version : Flag<"--version">;
 def _warn__EQ : Joined<"--warn-=">, Alias<W_Joined>;
 def _warn_ : Joined<"--warn-">, Alias<W_Joined>;
-def _working_directory : Separate<"--working-directory">,
-    HelpText<"Use the given argument as the effective working directory">;
 def _write_dependencies : Flag<"--write-dependencies">, Alias<MD>;
 def _write_user_dependencies : Flag<"--write-user-dependencies">, Alias<MMD>;
 def _ : Joined<"--">, Flags<[Unsupported]>;
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index 711b7db..6f49bec 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -38,7 +38,6 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Program.h"
-#include "llvm/Support/Process.h"
 
 #include "InputInfo.h"
 
@@ -324,13 +323,6 @@
   if (Args->hasArg(options::OPT_nostdlib))
     UseStdLib = false;
 
-  // Honor --working-directory. Eventually we want to handle this completely
-  // internally to support good use as a library, but for now we just change our
-  // working directory.
-  if (const Arg *A = Args->getLastArg(options::OPT__working_directory)) {
-    llvm::sys::Process::SetWorkingDirectory(A->getValue(*Args));
-  }
-
   Host = GetHostInfo(DefaultHostTriple.c_str());
 
   // Perform the default argument translations.
diff --git a/test/Driver/working-directory.c b/test/Driver/working-directory.c
deleted file mode 100644
index 26ae55f..0000000
--- a/test/Driver/working-directory.c
+++ /dev/null
@@ -1,3 +0,0 @@
-// RUN: touch %t.h
-// RUN: echo '#include "%t.h"' > %t.c
-// RUN: %clang --working-directory %t -fsyntax-only %t.c