diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 5a8d95b25d..0863e6354b 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -132,11 +132,6 @@ TARGET_GLOBAL_CFLAGS += -mbionic
 #
 TARGET_GLOBAL_CFLAGS += -D__ANDROID__
 
-# instructions "movbe" is only available in Intel atom.  Disable it
-# for general x86 device and x86 host which runs emulator-x86
-#
-TARGET_GLOBAL_CFLAGS += -mno-movbe
-
 # XXX: This flag is probably redundant since our toolchain binaries already
 # generate 32-bit machine code. It probably dates back to the old days
 # where we were using the host toolchain on Linux to build the platform
diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk
index 35a55201f9..c0d7a253a1 100644
--- a/target/board/generic_x86/BoardConfig.mk
+++ b/target/board/generic_x86/BoardConfig.mk
@@ -8,7 +8,7 @@ TARGET_NO_BOOTLOADER := true
 TARGET_NO_KERNEL := true
 TARGET_CPU_ABI := x86
 TARGET_ARCH := x86
-TARGET_ARCH_VARIANT := x86-atom
+TARGET_ARCH_VARIANT := x86
 TARGET_PRELINK_MODULE := false
 
 # The IA emulator (qemu) uses the Goldfish devices