This reverts commit b9731bccf2. Conflicts: server/server.go Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
b9731bccf2