diff --git a/meta-intel-edison-bsp/conf/machine/edison.conf b/meta-intel-edison-bsp/conf/machine/edison.conf
index 5e5d6109..0c2afab6 100644
--- a/meta-intel-edison-bsp/conf/machine/edison.conf
+++ b/meta-intel-edison-bsp/conf/machine/edison.conf
@@ -6,7 +6,7 @@
 # This sets compilation options close to what is used on android
 include conf/machine/include/x86/tune-corei7.inc
 TUNE_CCARGS .= " -mstackrealign"
-DEFAULTTUNE = "corei7-32"
+#DEFAULTTUNE = "corei7-32"
 
 MACHINE_FEATURES = "bluetooth alsa pci serial usbgadget usbhost wifi x86 ext3"
 KERNEL_IMAGETYPE = "bzImage"
@@ -16,8 +16,7 @@ SERIAL_CONSOLES = "115200;ttyS2"
 UBOOT_MACHINE = "edison_defconfig"
 
 # this tells yocto to use the defconfig supplied with the kernel
-#KBUILD_DEFCONFIG="x86_64_defconfig"
-KBUILD_DEFCONFIG="i386_defconfig"
+KBUILD_DEFCONFIG="x86_64_defconfig"
 # this tells yocto to expand the defconfig, i.e. make defconfig
 KCONFIG_MODE="--alldefconfig"