Switch to non-x86 only builds