--- a/configs/l1reconst-chg	Wed Jan 17 20:32:42 2018 +0000
+++ b/configs/l1reconst-chg	Wed Jan 17 22:53:14 2018 +0000
@@ -1,7 +1,20 @@
 # This configuration is the same as the plain l1reconst except one difference:
 # the FCHG SWE (new FreeCalypso battery management code) is enabled.
 
-scripts/config-headers.sh gprs 2091-fchg
+GPRS=1
+MMI=0
+SRVC=1
+export GPRS MMI SRVC
+
+ATP_STATE=0
+FCHG_STATE=1
+LCC_STATE=0
+MKS_STATE=0
+PWR_STATE=0
+R2D_STATE=0
+export ATP_STATE FCHG_STATE LCC_STATE MKS_STATE PWR_STATE R2D_STATE
+
+scripts/config-headers-new.sh
 
 CONDAT=condat2
 GPF=gpf2
@@ -10,11 +23,6 @@
 ACI=aci2
 export CONDAT GPF CDGINC CDGPRIM ACI
 
-GPRS=1
-MMI=0
-SRVC=1
-export GPRS MMI SRVC
-
 blob_lib_std ccddata
 
 # ACI libs