Yes. I don't have handy a list of the exact imports to rewrite.
That could be arranged, but it would take some changes to
other parts of godep and it doesn't seem worthwhile.