No more automatic call for client.end