Summary of changes: 6b1e440... get this thing building again (*) 2021575... Drop vendor tag. (*) (*) This commit already existed in another branch; no separate mail sent