revert back some defconfig options