lib/vagrant/environment.rb in vagrant-0.9.3 vs lib/vagrant/environment.rb in vagrant-0.9.4

@@ -195,16 +195,13 @@
 
     # Action registry for registering new actions with this environment.
     #
     # @return [Registry]
     def action_registry
-      return @action_registry if defined?(@action_registry)
-
-      # The action registry hasn't been loaded yet, so load it
-      # and setup the built-in actions with it.
-      @action_registry = Registry.new
-      Vagrant::Action.builtin!(@action_registry)
-      @action_registry
+      # For now we return the global built-in actions registry. In the future
+      # we may want to create an isolated registry that inherits from this
+      # global one, but for now there isn't a use case that calls for it.
+      Vagrant.actions
     end
 
     # Loads on initial access and reads data from the global data store.
     # The global data store is global to Vagrant everywhere (in every environment),
     # so it can be used to store system-wide information. Note that "system-wide"