diff --git a/passes/cmds/bugpoint.cc b/passes/cmds/bugpoint.cc
index 897dd8459..21058f50d 100644
--- a/passes/cmds/bugpoint.cc
+++ b/passes/cmds/bugpoint.cc
@@ -149,9 +149,6 @@ struct BugpointPass : public Pass {
 		if (grep.empty())
 			return true;
 
-		if (grep.size() > 2 && grep.front() == '"' && grep.back() == '"')
-			grep = grep.substr(1, grep.size() - 2);
-
 		string bugpoint_file = "bugpoint-case";
 		if (suffix.size())
 			bugpoint_file += stringf(".%.8s", suffix);
diff --git a/passes/cmds/setenv.cc b/passes/cmds/setenv.cc
index 90eeab702..39a6c73ca 100644
--- a/passes/cmds/setenv.cc
+++ b/passes/cmds/setenv.cc
@@ -46,7 +46,6 @@ struct SetenvPass : public Pass {
 
 		std::string name = args[1];
 		std::string value = args[2];
-		if (value.front() == '\"' && value.back() == '\"') value = value.substr(1, value.size() - 2);
 		
 #if defined(_WIN32)
 		_putenv_s(name.c_str(), value.c_str());