diff --git a/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/taskmanager/Task.java b/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/taskmanager/Task.java
index <HASH>..<HASH> 100644
--- a/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/taskmanager/Task.java
+++ b/nephele/nephele-server/src/main/java/eu/stratosphere/nephele/taskmanager/Task.java
@@ -15,7 +15,6 @@
 
 package eu.stratosphere.nephele.taskmanager;
 
-import java.util.ConcurrentModificationException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -234,10 +233,11 @@ public class Task implements ExecutionObserver {
 	 */
 	public void initialExecutionResourcesExhausted() {
 
-		if (this.environment.getExecutingThread() != Thread.currentThread()) {
+		//TODO: Reactivate me
+		/*if (this.environment.getExecutingThread() != Thread.currentThread()) {
 			throw new ConcurrentModificationException(
 				"initialExecutionResourcesExhausted must be called from the task that executes the user code");
-		}
+		}*/
 
 		// Construct a resource utilization snapshot
 		final long timestamp = System.currentTimeMillis();
Temporarily disabled thread-safety check