--- /var/lib/one/remotes/datastore/fs/cp.orig   2017-10-19 13:16:17.578747082 +0000
+++ /var/lib/one/remotes/datastore/fs/cp        2017-10-19 13:16:38.298834879 +0000
@@ -103,7 +103,7 @@
     DOWNLOADER_ARGS=`set_downloader_args "$MD5" "$SHA1" "$NO_DECOMPRESS" "$LIMIT_TRANSFER_BW" "$SRC" "$DST"`
 fi
 
-COPY_COMMAND="$UTILS_PATH/downloader.sh $DOWNLOADER_ARGS"
+COPY_COMMAND="/var/tmp/one/datastore/downloader.sh $DOWNLOADER_ARGS"
 
 if echo "$SRC" | grep -vq '^https\?://'; then
     if [ `check_restricted $SRC` -eq 1 ]; then
@@ -134,7 +134,7 @@
     DST_HOST=`get_destination_host $ID`
     TMP_DST="$STAGING_DIR/$IMAGE_HASH"
 
-    exec_and_log "eval $COPY_COMMAND | $SSH $DST_HOST $DD of=$TMP_DST bs=64k" \
+    ssh_exec_and_log "$DST_HOST" "$COPY_COMMAND | $DD of=$TMP_DST bs=64k" \
                  "Error dumping $SRC to $DST_HOST:$TMP_DST"
 
     ssh_exec_and_log    "$DST_HOST" "mkdir -p $BASE_PATH; mv -f $TMP_DST $DST" \