This reverts commit 962e1186f9a0a43344e19dcf70bac159f0eafb4e. Conflicts: contrib/mkimage-arch.sh Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol) Upstream-commit: de5f3020d92f14e7ff544d92440c5bf9e012d460 Component: engine