partial revert, this will show what lines need adding into our new defconfig