This is a follow up PR to #1381 to address some of the review comments we didn't get to. Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com> (cherry picked from commit c12e23a4c1f2811d06f4ba60229963b9b009bfa9) Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>