Revert bulk ZC_defconfig