After a bunch of recent changes/rebasing our vendored dependencies got a little out of sync w.r.t transitive dependencies through codebases that are not themselves Go Modules yet.
