Simplify vendor resolution

[#50171283]