diff --git a/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java b/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java
index 23b5a57aab664..0f61d88921232 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/ExecutionEnvironment.java
@@ -277,10 +277,13 @@ public String getIdString() {
 	 * @param timeout The timeout, in seconds.
 	 */
 	public void setSessionTimeout(long timeout) {
-		if (timeout < 0) {
-			throw new IllegalArgumentException("The session timeout must not be less than zero.");
-		}
-		this.sessionTimeout = timeout;
+		throw new IllegalStateException("Support for sessions is currently disabled. " +
+				"It will be enabled in future Flink versions.");
+		// Session management is disabled, revert this commit to enable
+		//if (timeout < 0) {
+		//	throw new IllegalArgumentException("The session timeout must not be less than zero.");
+		//}
+		//this.sessionTimeout = timeout;
 	}
 
 	/**
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java b/flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java
index 5fd272b38b764..7c85ed96d2014 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/LocalEnvironment.java
@@ -78,8 +78,10 @@ public JobExecutionResult execute(String jobName) throws Exception {
 		}
 
 		Plan p = createProgramPlan(jobName);
-		p.setJobId(jobID);
-		p.setSessionTimeout(sessionTimeout);
+
+		// Session management is disabled, revert this commit to enable
+		//p.setJobId(jobID);
+		//p.setSessionTimeout(sessionTimeout);
 
 		JobExecutionResult result = executor.executePlan(p);
 
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/RemoteEnvironment.java b/flink-java/src/main/java/org/apache/flink/api/java/RemoteEnvironment.java
index 6ae1f263f1687..63f59d3a15928 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/RemoteEnvironment.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/RemoteEnvironment.java
@@ -86,8 +86,10 @@ public JobExecutionResult execute(String jobName) throws Exception {
 		ensureExecutorCreated();
 
 		Plan p = createProgramPlan(jobName);
-		p.setJobId(jobID);
-		p.setSessionTimeout(sessionTimeout);
+
+		// Session management is disabled, revert this commit to enable
+		//p.setJobId(jobID);
+		//p.setSessionTimeout(sessionTimeout);
 
 		JobExecutionResult result = executor.executePlan(p);