Revert use of single GOPATH for building