2 files changed, 0 insertions, 8 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index f49a9f4a..c5f4fc7a 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -422,8 +422,6 @@ module Bundler
       Bundler.definition.validate_ruby!
       Bundler.load.setup_environment
 
-      ENV['BUNDLE_EXECING'] = options["no-color"] ? "no-color" : "color"
-
       begin
         # Run
         Kernel.exec(*ARGV)
diff --git a/lib/bundler/setup.rb b/lib/bundler/setup.rb
index 31415bd0..d5770977 100644
--- a/lib/bundler/setup.rb
+++ b/lib/bundler/setup.rb
@@ -1,5 +1,4 @@
 require 'bundler/shared_helpers'
-require 'bundler/friendly_errors'
 
 if Bundler::SharedHelpers.in_bundle?
   require 'bundler'
@@ -14,11 +13,6 @@ if Bundler::SharedHelpers.in_bundle?
       end
       exit e.status_code
     end
-  elsif ENV['BUNDLE_EXECING']
-    require 'bundler/vendored_thor'
-    the_shell = (ENV['BUNDLE_EXECING'] == "no-color" ? Thor::Shell::Basic.new : Thor::Base.shell.new)
-    Bundler.ui = Bundler::UI::Shell.new(the_shell)
-    Bundler.with_friendly_errors {Bundler.setup }
   else
     Bundler.setup
   end