diff --git a/init/builtins.cpp b/init/builtins.cpp
index 66133fb6b..e56ec4e07 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -538,11 +538,11 @@ static int do_mount_all(const std::vector<std::string>& args) {
     import_late(args, 2);
 
     if (ret == FS_MGR_MNTALL_DEV_NEEDS_ENCRYPTION) {
-        property_set("vold.decrypt", "trigger_encryption");
+        ActionManager::GetInstance().QueueEventTrigger("encrypt");
     } else if (ret == FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED) {
         property_set("ro.crypto.state", "encrypted");
         property_set("ro.crypto.type", "block");
-        property_set("vold.decrypt", "trigger_default_encryption");
+        ActionManager::GetInstance().QueueEventTrigger("defaultcrypto");
     } else if (ret == FS_MGR_MNTALL_DEV_NOT_ENCRYPTED) {
         property_set("ro.crypto.state", "unencrypted");
         ActionManager::GetInstance().QueueEventTrigger("nonencrypted");
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 769f41306..7723a4303 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -551,13 +551,6 @@ on nonencrypted
     class_start main
     class_start late_start
 
-on property:vold.decrypt=trigger_default_encryption
-    start defaultcrypto
-
-on property:vold.decrypt=trigger_encryption
-    start surfaceflinger
-    start encrypt
-
 on property:sys.init_log_level=*
     loglevel ${sys.init_log_level}