Migration/next client golang 2nd try

@juliusv 

Again, this has to wait for flipping the switch for client_golang.
Good catch. We should discuss a solution in person...