diff --git a/init/Android.mk b/init/Android.mk
index 66ce8a811..d8b574f2a 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -89,8 +89,8 @@ LOCAL_STATIC_LIBRARIES := \
     libsquashfs_utils \
     liblogwrap \
     libcutils \
-    libbase \
     libext4_utils_static \
+    libbase \
     libutils \
     libc \
     libselinux \
diff --git a/init/builtins.cpp b/init/builtins.cpp
index 210ce4ad3..229487fe7 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -878,9 +878,6 @@ static int do_installkey(const std::vector<std::string>& args) {
 }
 
 static int do_init_user0(const std::vector<std::string>& args) {
-    if (!is_file_crypto()) {
-        return 0;
-    }
     return e4crypt_do_init_user0();
 }
 
diff --git a/rootdir/init.rc b/rootdir/init.rc
index b354cbb30..3a7aa1f73 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -412,19 +412,20 @@ on post-fs-data
 
     mkdir /data/system 0775 system system
     mkdir /data/system/heapdump 0700 system system
+
+    mkdir /data/system_de 0770 system system
     mkdir /data/system_ce 0770 system system
-    mkdir /data/system_ce/0 0770 system system
+
+    mkdir /data/misc_de 01771 system misc
+    mkdir /data/misc_ce 01771 system misc
 
     mkdir /data/user 0711 system system
     mkdir /data/user_de 0711 system system
-    mkdir /data/user_de/0 0771 system system
+    symlink /data/data /data/user/0
 
     mkdir /data/media 0770 media_rw media_rw
-    mkdir /data/media/0 0770 media_rw media_rw
     mkdir /data/media/obb 0770 media_rw media_rw
 
-    symlink /data/data /data/user/0
-
     init_user0
 
     # Reload policy from /data/security if present.