No more VendorsKit dependency