diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml
index 96773f935e..b90b719cb6 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ami/files/cloud-config.yml
@@ -32,8 +32,7 @@ coreos:
           Description=Legacy c10n support from EC2 metadata
           Requires=ec2-cloudinit.service
           After=ec2-cloudinit.service
-          # hack: This only runs on the generic images
-          ConditionPathExists=/media/state/overlays/home
+          ConditionPathIsMountPoint=!/usr
 
           [Service]
           Type=oneshot