diff --git a/lib/vagrant/environment/remote.rb b/lib/vagrant/environment/remote.rb
index 011c7a708..1ee9d93d3 100644
--- a/lib/vagrant/environment/remote.rb
+++ b/lib/vagrant/environment/remote.rb
@@ -38,13 +38,7 @@ module Vagrant
         # When starting up in server mode, Vagrant will set the environment
         # client to the value `:stub`. So, check that we have an actual
         # CommandServe::Client::Project by checking for a client
-        if @client.class != Symbol
-          machine_index_client = @client.machine_index
-          @machine_index ||= Vagrant::MachineIndex.new()
-          @machine_index.client = machine_index_client
-          @machine_index
-        end
-        @machine_index
+        @machine_index ||= Vagrant::MachineIndex.new(client: client.target_index)
       end
     end
   end
diff --git a/lib/vagrant/machine/remote.rb b/lib/vagrant/machine/remote.rb
index 1c16a8bbc..d8f287c91 100644
--- a/lib/vagrant/machine/remote.rb
+++ b/lib/vagrant/machine/remote.rb
@@ -42,7 +42,7 @@ module Vagrant
         #TODO: get box from @client.get_box()
         @box             = box
         @config          = config
-        @data_dir        = @client.get_data_dir()
+        @data_dir        = @client.data_dir
         @vagrantfile     = vagrantfile
         @guest           = Guest.new(
           self,