diff --git a/cloud-init.changes b/cloud-init.changes
index 2c4b96f..0933b79 100644
--- a/cloud-init.changes
+++ b/cloud-init.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Aug  2 06:57:30 UTC 2013 - rschweikert@suse.com
+
+- remove the "nofail" option for the ephemeral storage
+  + when using nofail an attempt is made to mount the filesystem twice
+    once via udev and once through localfs, this results in a hanging
+    system if fsck needs to run on the device
+
 -------------------------------------------------------------------
 Thu Jul 11 08:00:50 UTC 2013 - speilicke@suse.com
 
diff --git a/cloud.cfg.suse b/cloud.cfg.suse
index b2f9497..fec2483 100644
--- a/cloud.cfg.suse
+++ b/cloud.cfg.suse
@@ -6,7 +6,7 @@ users:
 disable_root: false
 preserve_hostname: false
 syslog_fix_perms: root:root
-mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2']
+mount_default_fields: [~, ~, 'auto', 'defaults', '0', '2']
 
 # The modules that run in the 'init' stage
 cloud_init_modules: