Change my copy to be independent of source, until fix for go get is applied