Revert some defconfig changes