Index: cloud-init-0.7.9/systemd/cloud-init.service
===================================================================
--- cloud-init-0.7.9.orig/systemd/cloud-init.service
+++ cloud-init-0.7.9/systemd/cloud-init.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Initial cloud-init job (metadata service crawler)
-DefaultDependencies=no
 Wants=cloud-init-local.service
 Wants=sshd-keygen.service
 Wants=sshd.service
@@ -9,9 +8,7 @@ After=networking.service
 Before=network-online.target
 Before=sshd-keygen.service
 Before=sshd.service
-Before=sysinit.target
 Before=systemd-user-sessions.service
-Conflicts=shutdown.target
 
 [Service]
 Type=oneshot