non-vendoring WIP