diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 593c91e2..c0351a46 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -805,12 +805,6 @@ on  property:persist.sys.test_harness=1 && property:persist.vendor.testing_batte
     setprop persist.vendor.charge.start.level 0
     setprop vendor.battery.defender.disable 1
 
-on property:persist.vendor.charge.stop.level=*
-    write /sys/devices/platform/google,charger/charge_stop_level ${persist.vendor.charge.stop.level}
-
-on property:persist.vendor.charge.start.level=*
-    write /sys/devices/platform/google,charger/charge_start_level ${persist.vendor.charge.start.level}
-
 service insmod_sh_common /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.gs201.cfg
     class main
     user root
diff --git a/health/Health.cpp b/health/Health.cpp
index d4030631..453c151a 100644
--- a/health/Health.cpp
+++ b/health/Health.cpp
@@ -67,7 +67,9 @@ constexpr char kVoltageAvg[] {FG_DIR "/voltage_now"};
 
 #define WLC_DIR "/sys/class/power_supply/wireless"
 
-static BatteryDefender battDefender(WLC_DIR "/present");
+static BatteryDefender battDefender(WLC_DIR "/present",
+    "/sys/devices/platform/google,charger/charge_start_level",
+    "/sys/devices/platform/google,charger/charge_stop_level");
 static BatteryThermalControl battThermalControl(
     "dev/thermal/tz-by-name/soc/mode");
 static BatteryMetricsLogger battMetricsLogger(kBatteryResistance, kBatteryOCV);