fix vendoring, pass 1
fix vendoring, pass 2