Revert breaking change to client.NewClient
function
#3579
Merged
client.NewClient
function
#3579