This reverts commit ff92f45be4, reversing changes made to 80e31df3b6. Reverting to make the next revert easier. Signed-off-by: Tibor Vass <tibor@docker.com>
ff92f45be4
80e31df3b6