From 36f64db874fed5a9ed345935b39fbd20337253ae Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Sun, 5 Jan 2014 16:49:25 -0800
Subject: [PATCH] Always setup plugins, but just don't always require them

---
 bin/vagrant                 | 4 +---
 lib/vagrant/pre-rubygems.rb | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/bin/vagrant b/bin/vagrant
index 6f72807f5..448803bd7 100755
--- a/bin/vagrant
+++ b/bin/vagrant
@@ -59,10 +59,8 @@ require "vagrant/shared_helpers"
 
 # Setup our dependencies by initializing Bundler. If we're using plugins,
 # then also initialize the paths to the plugins.
-groups = [:default]
-groups << :plugins if Vagrant.plugins_enabled?
 require "bundler"
-Bundler.setup(*groups)
+Bundler.setup
 
 require 'log4r'
 require 'vagrant'
diff --git a/lib/vagrant/pre-rubygems.rb b/lib/vagrant/pre-rubygems.rb
index f90b7cc40..ab381f431 100644
--- a/lib/vagrant/pre-rubygems.rb
+++ b/lib/vagrant/pre-rubygems.rb
@@ -16,8 +16,7 @@ require_relative "bundler"
 require_relative "plugin/manager"
 require_relative "shared_helpers"
 
-plugins = []
-plugins = Vagrant::Plugin::Manager.instance.installed_plugins if Vagrant.plugins_enabled?
+plugins = Vagrant::Plugin::Manager.instance.installed_plugins
 Vagrant::Bundler.instance.init!(plugins)
 
 ENV["VAGRANT_INTERNAL_BUNDLERIZED"] = "1"