Not related to this change, but why is the ARCH_X86 needed?