Fix build for non-x86 arches again.