diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 1846276..6ff86de 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -11,12 +11,6 @@
     obmc-host-reboot@{}.target.requires/phosphor-reboot-host@{}.service \
     "
 
-# When we issue a shutdown we need to "stop" the host also so that the
-# Host.CurrentHostState goes to "Off".
-HOST_DEFAULT_TARGETS:append:yosemite4 = " \
-    obmc-host-shutdown@{}.target.requires/obmc-host-stop@{}.target \
-    "
-
 CHASSIS_DEFAULT_TARGETS:remove:yosemite4 = " \
     obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-on@{}.service \
     obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-running@{}.service \
diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc
index a1276e9..8e214c3 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc
@@ -7,6 +7,7 @@
     obmc-host-stop@{}.target.wants/phosphor-set-host-transition-to-off@{}.service \
     obmc-host-reset@{}.target.requires/phosphor-reset-host-running@{}.service \
     obmc-host-stop@{}.target.wants/phosphor-reset-sensor-states@{}.service \
+    obmc-host-shutdown@{}.target.requires/obmc-host-stop@{}.target \
     obmc-host-graceful-quiesce@{}.target.wants/obmc-host-quiesce@{}.target \
     obmc-host-graceful-quiesce@{}.target.wants/pldmSoftPowerOff.service \
     obmc-host-quiesce@{}.target.wants/phosphor-reset-sensor-states@{}.service \