diff --git a/device.mk b/device.mk
index bb02fae..658f7d4 100644
--- a/device.mk
+++ b/device.mk
@@ -32,8 +32,7 @@
 	lights.msm8960
 
 PRODUCT_PACKAGES += \
-    charger_res_images \
-    charger
+    charger_res_images
 
 # Live Wallpapers
 PRODUCT_PACKAGES += \
diff --git a/init.mako.rc b/init.mako.rc
index b2ac0f2..d929f4e 100644
--- a/init.mako.rc
+++ b/init.mako.rc
@@ -371,8 +371,10 @@
     # Adjust socket buffer to enlarge TCP receive window for high bandwidth (e.g. DO-RevB)
     write /proc/sys/net/ipv4/tcp_adv_win_scale  1
 
-service charger /charger
+service charger /sbin/healthd -c
     class charger
+    critical
+    seclabel u:r:healthd:s0
 
 # virtual sdcard daemon running as media_rw (1023)
 service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated