We forked the upstream to address a build issue on go 1.6 - that is long done and we don't need to manage our forks anymore.