[PATCH v2] Partially Revert "Don't mount the dump target unless needed"