diff --git a/lib/vagrant/guest/remote.rb b/lib/vagrant/guest/remote.rb
index 68913f42a..f6886b986 100644
--- a/lib/vagrant/guest/remote.rb
+++ b/lib/vagrant/guest/remote.rb
@@ -12,9 +12,8 @@ module Vagrant
       end
 
       def initialize(machine, guests, capabilities)
-        @capabilities = capabilities
-        @guests       = guests
-        @machine      = machine
+        @machine = machine
+        @client = machine.client.guest
         @logger = Log4r::Logger.new("vagrant::guest")
       end
 
diff --git a/lib/vagrant/machine/remote.rb b/lib/vagrant/machine/remote.rb
index 4f4790986..536d54994 100644
--- a/lib/vagrant/machine/remote.rb
+++ b/lib/vagrant/machine/remote.rb
@@ -48,10 +48,6 @@ module Vagrant
           @config          = config
           @data_dir        = @client.data_dir
           @vagrantfile     = vagrantfile
-          @guest           = Guest.new(
-            self,
-            Vagrant.plugin("2").manager.guests,
-            Vagrant.plugin("2").manager.guest_capabilities)
           @name            = name
           @ui_mutex        = Mutex.new
           @state_mutex     = Mutex.new
@@ -217,8 +213,8 @@ module Vagrant
 
       def guest
         raise Errors::MachineGuestNotReady if !communicate.ready?
-        if @guest.client.nil?
-          @guest.client = client.guest
+        if !@guest
+          @guest = Guest.new(self, nil, nil)
         end
         @guest
       end