make vendors x86-specific. Part of issue #348