defconfig: Partial revert to fix compiling