Leveraging `go fix` these changes were made, I only applied some regexp
to get the import grouping correct.

The old package can't be removed from vendor directory yet, as other
dependencies depend on it.