diff --git a/lib/vagrant.rb b/lib/vagrant.rb
index 128b42d69..3d513c004 100644
--- a/lib/vagrant.rb
+++ b/lib/vagrant.rb
@@ -231,10 +231,6 @@ module Vagrant
   # @param [String] component
   # @return [Class]
   def self.plugin(version, component=nil)
-    # TODO
-    if component.nil? && Vagrant.server_mode?
-      version = "remote"
-    end
     # Build up the key and return a result
     key    = version.to_s.to_sym
     key    = [key, component.to_s.to_sym] if component
diff --git a/lib/vagrant/plugin/v2/plugin.rb b/lib/vagrant/plugin/v2/plugin.rb
index 84f1c707a..950d0a910 100644
--- a/lib/vagrant/plugin/v2/plugin.rb
+++ b/lib/vagrant/plugin/v2/plugin.rb
@@ -24,7 +24,12 @@ module Vagrant
         #
         # @return [V2::Manager]
         def self.manager
-          @manager ||= Manager.new
+          if Vagrant.server_mode?
+            @manager ||= Vagrant::Plugin::Remote::Manager.new
+          else
+            @manager ||= Manager.new
+          end
+          @manager
         end
 
         # Returns the {Components} for this plugin.