Fix bind-mounts only partially removed Upstream-commit: ed8e89c54d975cfd84b0dc5d3e59ac754341f940 Component: engine