PR https://github.com/docker/docker/pull/17986 inadvertently included changes to some vendored files. This reverts those changes. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: dd3634b3c1926cac2b714be4e7b5be49dfc0d0f2 Component: engine