diff --git a/debuggerd/tombstoned/tombstoned.rc b/debuggerd/tombstoned/tombstoned.rc
index 3aacf332f..eaae9c475 100644
--- a/debuggerd/tombstoned/tombstoned.rc
+++ b/debuggerd/tombstoned/tombstoned.rc
@@ -1,6 +1,4 @@
 service tombstoned /system/bin/tombstoned
-    class core
-
     user tombstoned
     group system
 
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 998e064b4..8d974fa12 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -355,14 +355,13 @@ on post-fs-data
     # We restorecon /data in case the userdata partition has been reset.
     restorecon /data
 
-    # start debuggerd to make debugging early-boot crashes easier.
-    start debuggerd
-    start debuggerd64
-
     # Make sure we have the device encryption key.
     start vold
     installkey /data
 
+    # start tombstoned to record early-boot crashes.
+    start tombstoned
+
     # Start bootcharting as soon as possible after the data partition is
     # mounted to collect more data.
     mkdir /data/bootchart 0755 shell shell