Un-break the x86 Linux build