defconfig: revert some changes