--- a/configs/hybrid	Wed Jan 17 20:32:42 2018 +0000
+++ b/configs/hybrid	Wed Jan 17 22:53:14 2018 +0000
@@ -2,7 +2,20 @@
 # from TCS3.2/LoCosto onto the TCS211 foundation.  It is based on the
 # l1reconst config.
 
-scripts/config-headers.sh gprs 2091-pruned
+GPRS=1
+MMI=0
+SRVC=1
+export GPRS MMI SRVC
+
+ATP_STATE=0
+FCHG_STATE=0
+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=condat3
 GPF=gpf3
@@ -11,11 +24,6 @@
 ACI=g23m-aci
 export CONDAT GPF CDGINC CDGPRIM ACI
 
-GPRS=1
-MMI=0
-SRVC=1
-export GPRS MMI SRVC
-
 build_lib ccddata
 
 # ACI libs