diff --git a/lib/vagrant.rb b/lib/vagrant.rb
index 3cd5dfb6e..d25f84e7e 100644
--- a/lib/vagrant.rb
+++ b/lib/vagrant.rb
@@ -39,11 +39,27 @@ module VagrantPlugins
   OptionParser = Vagrant::OptionParser
 end
 
+# Load in our helpers and utilities
 require "vagrant/shared_helpers"
 require "rubygems"
 require "vagrant/util"
 require "vagrant/plugin/manager"
 
+# Update the load path so our protos can be located
+$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs").to_s
+$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto").to_s
+$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto/vagrant_plugin_sdk").to_s
+
+# Load our protos so they are available
+require 'vagrant/protobufs/proto/vagrant_server/server_pb'
+require 'vagrant/protobufs/proto/vagrant_server/server_services_pb'
+require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb'
+require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_services_pb'
+require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb'
+require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb'
+require 'vagrant/protobufs/proto/plugin/grpc_broker_pb'
+require 'vagrant/protobufs/proto/plugin/grpc_broker_services_pb'
+
 # Enable logging if it is requested. We do this before
 # anything else so that we can setup the output before
 # any logging occurs.
diff --git a/lib/vagrant/shared_helpers.rb b/lib/vagrant/shared_helpers.rb
index e87e974f1..b07c89a48 100644
--- a/lib/vagrant/shared_helpers.rb
+++ b/lib/vagrant/shared_helpers.rb
@@ -235,19 +235,6 @@ module Vagrant
   # @return [true]
   def self.enable_server_mode!
     if !server_mode?
-      $LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs").to_s
-      $LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto").to_s
-      $LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto/vagrant_plugin_sdk").to_s
-
-      require 'vagrant/protobufs/proto/vagrant_server/server_pb'
-      require 'vagrant/protobufs/proto/vagrant_server/server_services_pb'
-      require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb'
-      require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_services_pb'
-      require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb'
-      require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb'
-      require 'vagrant/protobufs/proto/plugin/grpc_broker_pb'
-      require 'vagrant/protobufs/proto/plugin/grpc_broker_services_pb'
-
       SERVER_MODE_CALLBACKS.each(&:call)
       Util::HCLogOutputter.new("hclog")
       Log4r::Outputter["hclog"].formatter = Util::HCLogFormatter.new