diff --git a/headers/config/HaikuConfig.h b/headers/config/HaikuConfig.h
index 761c9bcc24..881a7d9ca9 100644
--- a/headers/config/HaikuConfig.h
+++ b/headers/config/HaikuConfig.h
@@ -134,8 +134,7 @@
 #endif
 
 /* BeOS R5 compatible types */
-#ifndef __HAIKU_ARCH_64_BIT
-/*#ifdef __HAIKU_ARCH_X86*/
+#if defined(__HAIKU_ARCH_X86)
 	/* TODO: This should be "#ifdef __HAIKU_BEOS_COMPATIBLE", but this will
 	   break all gcc 4 C++ optional packages. I.e. switch that at a suitable
 	   time.