Fixes #25453 Signed-off-by: Dave Tucker <dt@docker.com> (cherry picked from commit 0e1fe4516fc7af03259753f6d264e91d11fe4d1a) Signed-off-by: Tibor Vass <tibor@docker.com>