diff --git a/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb
index 25ec7fe433..d6575ec65f 100755
--- a/src/vmm_mad/exec/one_vmm_exec.rb
+++ b/src/vmm_mad/exec/one_vmm_exec.rb
@@ -223,10 +223,7 @@ class VmmAction
 
                 params = get_parameters(step[:parameters])
 
-                result, info = vnm.do_action(@id,
-                                             step[:action],
-                                             :stdin => true,
-                                             :parameters => params)
+                result, info = vnm.do_action(@id, step[:action], :parameters => params)
             when :tm
                 result, info = @tm.do_transfer_action(@id, step[:parameters])
 
diff --git a/src/vnm_mad/one_vnm.rb b/src/vnm_mad/one_vnm.rb
index 3c5a8c8d5c..4cec19d5f7 100644
--- a/src/vnm_mad/one_vnm.rb
+++ b/src/vnm_mad/one_vnm.rb
@@ -62,15 +62,10 @@ class VirtualNetworkDriver
             cmd = action_command_line(aname, cmd_params, nil, subdirectory)
 
             if action_is_local?(aname)
-                execution = LocalCommand.run(cmd, log_method(id))
+                execution = LocalCommand.run(cmd, log_method(id), "#{@vm_encoded}")
             elsif @ssh_stream != nil
-                if options[:stdin]
-                    cmdin = "cat << EOT | #{cmd}"
-                    stdin = "#{@vm_encoded}\nEOT\n"
-                else
-                    cmdin = cmd
-                    stdin = nil
-                end
+                cmdin = "cat << EOT | #{cmd}"
+                stdin = "#{@vm_encoded}\nEOT\n"
 
                 execution = @ssh_stream.run(cmdin, stdin, cmd)
             else