diff --git a/bin/cdist-manifest-run b/bin/cdist-manifest-run
index 892f27cf..ae568c2a 100755
--- a/bin/cdist-manifest-run
+++ b/bin/cdist-manifest-run
@@ -23,7 +23,7 @@
 #
 
 . cdist-config
-[ $# -eq 3 ] || __cdist_usage "<target host> <manifest> <out object dir>"
+[ $# -eq 2 ] || __cdist_usage "<target host> <manifest>"
 set -u
 
 __cdist_target_host="$1"; shift
@@ -33,10 +33,6 @@ __cdist_manifest="$1"; shift
 # Export information for cdist-type-emulator or manifest
 #
 
-# This is a special variable, as being used by __cdist_object_dir
-# We need to adjust it, so cdist-type-emulator writes to the right location
-export __cdist_out_object_dir="$1"; shift
-
 # Config dir should not get reset - FIXME: why did I do this?
 export __cdist_conf_dir
 
@@ -62,7 +58,5 @@ export PATH="${__cdist_out_type_bin_dir}:$PATH"
    || __cdist_exit_err "Missing manifest ${__cdist_manifest}"
 [ -x "${__cdist_manifest}" ] \
    || __cdist_exit_err "${__cdist_manifest} needs to be executable."
-mkdir -p "${__cdist_out_object_dir}" \
-   || __cdist_exit_err "Cannot create output dir ${__cdist_out_object_dir}"
 
 __cdist_exec_fail_on_error "${__cdist_manifest}"