diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/Vagrantfile b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/Vagrantfile
index 055355aefa..db24837d3f 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/Vagrantfile
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/Vagrantfile
@@ -5,7 +5,8 @@ if Vagrant::VERSION < "1.5.0"
   raise "Need at least vagrant version 1.5.0, please update"
 end
 
-require_relative 'override-plugin.rb'
+require_relative 'change_host_name.rb'
+require_relative 'configure_networks.rb'
 
 Vagrant.configure("2") do |config|
   # SSH in as the default 'core' user, it has the vagrant ssh key.
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/change_host_name.rb b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/change_host_name.rb
new file mode 100644
index 0000000000..dfab7916be
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/change_host_name.rb
@@ -0,0 +1,37 @@
+# -*- mode: ruby -*-
+# # vi: set ft=ruby :
+
+# NOTE: This monkey-patching of the coreos guest plugin is a terrible
+# hack that needs to be removed once the upstream plugin works with
+# alpha CoreOS images.
+
+require 'tempfile'
+require Vagrant.source_root.join("plugins/guests/coreos/cap/change_host_name.rb")
+
+CLOUD_CONFIG = <<EOF
+#cloud-config
+
+hostname: %s
+EOF
+
+module VagrantPlugins
+  module GuestCoreOS
+    module Cap
+      class ChangeHostName
+        def self.change_host_name(machine, name)
+          machine.communicate.tap do |comm|
+            temp = Tempfile.new("coreos-vagrant")
+            temp.binmode
+            temp.write(CLOUD_CONFIG % [name])
+            temp.close
+
+            path = "/var/tmp/hostname.yml"
+            path_esc = path.gsub("/", "-")
+            comm.upload(temp.path, path)
+            comm.sudo("systemctl start system-cloudinit@#{path_esc}.service")
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/override-plugin.rb b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/configure_networks.rb
similarity index 77%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/override-plugin.rb
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/configure_networks.rb
index 0d19773887..674e475eab 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/override-plugin.rb
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/box/configure_networks.rb
@@ -50,8 +50,6 @@ module VagrantPlugins
               interfaces = result.split("\n")
             end
 
-            ip = ""
-
             # Configure interfaces
             # FIXME: fix matching of interfaces with IP adresses
             networks.each do |network|
@@ -63,38 +61,20 @@ module VagrantPlugins
               unit = NETWORK_UNIT % [unit_name, iface_name, address]
 
               cfg = "#{cfg}#{unit}"
-              ip = network[:ip]
             end
 
-            cfg = <<EOF
-#{cfg}
-write_files:
-  - path: /etc/environment
-    content: |
-      COREOS_PUBLIC_IPV4=#{ip}
-      COREOS_PRIVATE_IPV4=#{ip}
-
-hostname: #{machine.name}
-EOF
-
             temp = Tempfile.new("coreos-vagrant")
             temp.binmode
             temp.write(cfg)
             temp.close
 
-            comm.upload(temp.path, "/tmp/user-data")
-            comm.sudo("mkdir -p /var/lib/coreos-vagrant")
-            comm.sudo("mv /tmp/user-data /var/lib/coreos-vagrant/")
-
+            path = "/var/tmp/networks.yml"
+            path_esc = path.gsub("/", "-")
+            comm.upload(temp.path, path)
+            comm.sudo("systemctl start system-cloudinit@#{path_esc}.service")
           end
         end
       end
-
-      class ChangeHostName
-        def self.change_host_name(machine, name)
-          # This is handled in configure_networks
-        end
-      end
     end
   end
 end
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml
index c1d72a601b..a40a1b65f0 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vagrant/files/cloud-config.yml
@@ -1,13 +1,6 @@
 #cloud-config
 coreos:
     units:
-      - name: coreos-cloudinit-vagrant.path
-        command: start
-        runtime: no
-        content: |
-          [Path]
-          PathExists=/var/lib/coreos-vagrant/user-data
-          Unit=system-cloudinit@var-lib-coreos\x2dvagrant-user\x2ddata.service
       - name: coreos-cloudinit-vagrant-user.path
         command: start
         runtime: no