diff --git a/rootdir/init.rc b/rootdir/init.rc
index ad5647bc8..0045fd609 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -346,9 +346,6 @@ on post-fs
     # create the lost+found directories, so as to enforce our permissions
     mkdir /cache/lost+found 0770 root root
 
-on late-fs
-    start hwservicemanager
-
 on post-fs-data
     # We chown/chmod /data again so because mount is run as root + defaults
     chown system system /data
@@ -592,9 +589,8 @@ on boot
     # Define default initial receive window size in segments.
     setprop net.tcp.default_init_rwnd 60
 
-    # Start standard binderized HAL daemons
-    class_start hal
-
+    # Start all binderized HAL daemons
+    start hwservicemanager
     class_start core
 
 on nonencrypted