This reverts commit 85744a35de0e30c2dd6741b833f38ff218c8a3fc. Conflicts: .gitignore hack/make.sh Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle) Upstream-commit: ec1420cc2b228116d4aa9c812bd98fa8acdc1b98 Component: engine