diff --git a/lib/vagrant/environment/remote.rb b/lib/vagrant/environment/remote.rb
index f85b012f4..05c21d86e 100644
--- a/lib/vagrant/environment/remote.rb
+++ b/lib/vagrant/environment/remote.rb
@@ -18,6 +18,7 @@ module Vagrant
         end
         super
         @logger = Log4r::Logger.new("vagrant::environment")
+        @local_data_path = Pathname.new(@client.local_data_path())
       end
 
       # Gets a target (machine) by name
diff --git a/plugins/commands/serve/client/machine.rb b/plugins/commands/serve/client/machine.rb
index 133b4e040..d9fc4e7b8 100644
--- a/plugins/commands/serve/client/machine.rb
+++ b/plugins/commands/serve/client/machine.rb
@@ -76,11 +76,6 @@ module VagrantPlugins
           Pathname.new(@client.data_dir(req).data_dir)
         end
 
-        # TODO: local data path comes from the project
-        def get_local_data_path
-          #TODO
-        end
-
         def get_provider
           req = Google::Protobuf::Empty.new
           @client.provider(req)
diff --git a/plugins/commands/serve/client/project.rb b/plugins/commands/serve/client/project.rb
index 547d3043b..d47d30cfb 100644
--- a/plugins/commands/serve/client/project.rb
+++ b/plugins/commands/serve/client/project.rb
@@ -17,6 +17,14 @@ module VagrantPlugins
           self.new(conn.to_s, broker)
         end
 
+        # Gets the local data path
+        # return [String]
+        def get_local_data_path
+          req = Google::Protobuf::Empty.new
+          resp = @client.local_data(req)
+          return resp.path
+        end
+
         # Returns a machine client for the given name
         # return [VagrantPlugins::CommandServe::Client::Machine]
         def target(name)