diff --git a/common/source/java/ch/systemsx/cisd/common/process/ProcessExecutionHelper.java b/common/source/java/ch/systemsx/cisd/common/process/ProcessExecutionHelper.java
index b70e2194515386698810e697b5c84e2ea18fa2e9..ec8835aebb94bc250fea704e2e6d0cef1966c168 100644
--- a/common/source/java/ch/systemsx/cisd/common/process/ProcessExecutionHelper.java
+++ b/common/source/java/ch/systemsx/cisd/common/process/ProcessExecutionHelper.java
@@ -235,15 +235,12 @@ public final class ProcessExecutionHelper
      * @param cmd The command line to run.
      * @param operationLog The {@link Logger} to use for all message on the higher level.
      * @param machineLog The {@link Logger} to use for all message on the lower (machine) level.
-     * @param millisToWaitForCompletion The time to wait for the process to complete in milli
-     *            seconds. If the process is not finished after that time, it will be terminated by
-     *            a watch dog.
      * @return The handler which allows to wait for the result or terminate the process.
      */
     public static IProcessHandler runUnblocking(final List<String> cmd, final Logger operationLog,
-            final Logger machineLog, final long millisToWaitForCompletion)
+            final Logger machineLog)
     {
-        return new ProcessExecutionHelper(cmd, millisToWaitForCompletion,
+        return new ProcessExecutionHelper(cmd, ConcurrencyUtilities.NO_TIMEOUT,
                 DEFAULT_OUTPUT_READING_STRATEGY, operationLog, machineLog).runUnblocking();
     }
 
@@ -332,7 +329,7 @@ public final class ProcessExecutionHelper
                 {
                     processWrapper.set(process);
                     final int exitValue = process.waitFor();
-                     if (processWrapper.getAndSet(null) == null)
+                    if (processWrapper.getAndSet(null) == null)
                     {
                         // Value is irrelevant, the ProcessKiller got us.
                         return null;
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java
index aef08e4af7c06e5e6fcd3849d1aa2fcd825dab50..feb60bdd830631074725dd76485fbcf9c0ea7b76 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java
@@ -282,7 +282,7 @@ public class ProcessExecutionHelperTest
         final File dummyExec = createSleepingExecutable("sleep.sh", 2 * WATCHDOG_WAIT_MILLIS);
         final IProcessHandler handler =
                 ProcessExecutionHelper.runUnblocking(Arrays.asList(dummyExec.getAbsolutePath()),
-                        operationLog, machineLog, WATCHDOG_WAIT_MILLIS);
+                        operationLog, machineLog);
         final AtomicReference<ProcessResult> result = new AtomicReference<ProcessResult>(null);
         final Runnable resultGetter = new Runnable()
             {