Signed-off-by: David Karlsson <david.karlsson@docker.com> (cherry picked from commit ba8fa6c403)
ba8fa6c403