From 51be92eeb60ce9082ccb561c187cda8fd3a5c101 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 14 Jun 2012 18:46:48 -0700
Subject: [PATCH] Remove dependence on V1 Kernel from Environment

---
 lib/vagrant/config/v1.rb   | 4 ++++
 lib/vagrant/environment.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/config/v1.rb b/lib/vagrant/config/v1.rb
index 68616835e..f39311c63 100644
--- a/lib/vagrant/config/v1.rb
+++ b/lib/vagrant/config/v1.rb
@@ -76,6 +76,10 @@ module Vagrant
         # Get all the registered plugins
         config_map = {}
         Vagrant.plugin("1").registered.each do |plugin|
+          # Activate the plugin since we're about to use it
+          plugin.activate!
+
+          # Get all the available configuration keys and add them to the map
           plugin.config.each do |key, klass|
             config_map[key] = klass
           end
diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb
index 11949cb1d..b1a997ca9 100644
--- a/lib/vagrant/environment.rb
+++ b/lib/vagrant/environment.rb
@@ -422,7 +422,7 @@ module Vagrant
       # to simply be our configuration.
       if defined_vm_keys.empty?
         defined_vm_keys << DEFAULT_VM
-        defined_vms[DEFAULT_VM] = VagrantPlugins::Kernel::VagrantConfigSubVM.new
+        defined_vms[DEFAULT_VM] = nil
       end
 
       vm_configs = defined_vm_keys.map do |vm_name|