This reverts commit d2f75a3040e72562ffa825d5c3efa7004af2640a. Conflicts: integration-cli/docker_api_events_test.go Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle) Upstream-commit: b66ac6a80990d382a3859cd5ca8c53f038bdc1ff Component: engine