diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/RestartableItemOrientedTasklet.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/RestartableItemOrientedTasklet.java
deleted file mode 100644
index 0ae4e17e5..000000000
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/RestartableItemOrientedTasklet.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2006-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.batch.execution.tasklet;
-
-import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.item.ItemStream;
-import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.item.StreamContext;
-import org.springframework.batch.item.StreamException;
-
-/**
- * An extension of {@link ItemOrientedTasklet} that delegates calls to
- * {@link ItemStream} to the reader and writer.
- * 
- * @see ItemReader
- * @see ItemWriter
- * @see ItemStream
- * 
- * @author Lucas Ward
- * @author Dave Syer
- * 
- */
-public class RestartableItemOrientedTasklet extends ItemOrientedTasklet implements ItemStream {
-
-	/**
-	 * @see ItemStream#getStreamContext()
-	 */
-	public StreamContext getStreamContext() {
-		throw new UnsupportedOperationException("This class is not used");
-	}
-
-	/**
-	 * @see ItemStream#restoreFrom(StreamContext)
-	 */
-	public void restoreFrom(StreamContext data) {
-		throw new UnsupportedOperationException("This class is not used");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.springframework.batch.item.ItemStream#open()
-	 */
-	public void open() throws StreamException {
-		throw new UnsupportedOperationException("Not implemented.");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.springframework.batch.item.ItemStream#close()
-	 */
-	public void close() throws StreamException {
-		throw new UnsupportedOperationException("Not implemented.");		
-	}
-}
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTasklet.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTasklet.java
index af50d1e05..182ac5d4a 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTasklet.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTasklet.java
@@ -18,7 +18,7 @@ package org.springframework.batch.sample.tasklet;
 
 
 import org.springframework.batch.core.tasklet.Tasklet;
-import org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet;
+import org.springframework.batch.execution.tasklet.ItemOrientedTasklet;
 import org.springframework.batch.io.exception.BatchCriticalException;
 import org.springframework.batch.repeat.ExitStatus;
 
@@ -29,7 +29,7 @@ import org.springframework.batch.repeat.ExitStatus;
  * @author Robert Kasanicky
  *
  */
-public class ExceptionRestartableTasklet extends RestartableItemOrientedTasklet {
+public class ExceptionRestartableTasklet extends ItemOrientedTasklet {
 
 	private int counter = 0;
 	private int throwExceptionOnRecordNumber = 4;
@@ -57,7 +57,5 @@ public class ExceptionRestartableTasklet extends RestartableItemOrientedTasklet
 	public int getThrowExceptionOnRecordNumber() {
 		return throwExceptionOnRecordNumber;
 	}
-	
-	
 
 }
diff --git a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
index 4ad3cb6ec..c7935480c 100644
--- a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
@@ -16,7 +16,7 @@
 				<bean id="step1" parent="simpleStep">
 					<property name="tasklet">
 						<bean
-							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 							<property name="itemReader">
 								<bean
 									class="org.springframework.batch.item.reader.ValidatingItemReader">
@@ -35,7 +35,7 @@
 				<bean id="step2" parent="simpleStep">
 					<property name="tasklet">
 						<bean
-							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 							<property name="itemReader" ref="fileInputTemplate2" />
 							<property name="itemWriter">
 								<bean class="org.springframework.batch.sample.item.writer.PersonWriter" />
diff --git a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
index 8ab0bf7a9..e11d1d852 100644
--- a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml
@@ -15,7 +15,7 @@
 			<bean id="step1" parent="simpleStep">
 				<property name="tasklet">
 					<bean
-						class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 						<property name="itemReader">
 							<bean
 								class="org.springframework.batch.item.reader.ValidatingItemReader">
diff --git a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
index a52ec2cb3..0bfa49a92 100644
--- a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml
@@ -15,7 +15,7 @@
 			<bean id="step1" parent="simpleStep">
 				<property name="tasklet">
 					<bean
-						class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 						<property name="itemReader">
 							<bean
 								class="org.springframework.batch.item.reader.ValidatingItemReader">
diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
index 479b77a83..f1516d420 100644
--- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
@@ -22,7 +22,7 @@
 					<property name="allowStartIfComplete" value="false" />
 					<property name="tasklet">
 						<bean
-							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 							<property name="itemReader"
 								ref="playerFileItemReader" />
 							<property name="itemWriter">
@@ -45,7 +45,7 @@
 					<property name="startLimit" value="100" />
 					<property name="tasklet">
 						<bean
-							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 							<property name="itemReader"
 								ref="gameFileItemReader" />
 							<property name="itemWriter">
@@ -63,7 +63,7 @@
 					<property name="startLimit" value="100" />
 					<property name="tasklet">
 						<bean
-							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 							<property name="itemReader"
 								ref="playerSummarizationSource" />
 							<property name="itemWriter">
diff --git a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
index ed4eea8c7..602014e6c 100644
--- a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
@@ -21,7 +21,7 @@
 			<bean id="step1" parent="repeatOperationsStep">
 				<property name="tasklet">
 					<bean
-						class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 						<property name="itemReader"
 							ref="hibernateItemReader" />
 						<property name="itemWriter"
diff --git a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
index b80d058e9..0ce7096de 100644
--- a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml
@@ -19,7 +19,7 @@
 			<bean id="step1" parent="simpleStep">
 				<property name="tasklet">
 					<bean
-						class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 						<property name="itemReader" ref="ibatisItemReader" />
 						<property name="itemWriter">
 							<bean class="org.springframework.batch.sample.item.writer.CustomerCreditIncreaseWriter">
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
index ca8e95adc..6a0f05810 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
@@ -15,7 +15,7 @@
 			<bean id="step1" parent="simpleStep">
 				<property name="tasklet">
 					<bean
-						class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 						<property name="itemReader">
 							<bean
 								class="org.springframework.batch.item.reader.AggregateItemReader">
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
index 86a7c3567..65548cf70 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
@@ -18,7 +18,7 @@
 			<bean id="step1" parent="simpleStep">
 				<property name="tasklet">
 					<bean
-						class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 						<property name="itemReader">
 							<bean class="org.springframework.batch.sample.item.reader.OrderItemReader">
 								<property name="itemReader" ref="fileInputTemplate" />
diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
index c3e22fa92..d846b57fa 100644
--- a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
@@ -18,7 +18,7 @@
 				<bean id="staging" parent="simpleStep">
 					<property name="tasklet">
 						<bean
-							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 							<property name="itemReader">
 								<bean
 									class="org.springframework.batch.item.reader.ValidatingItemReader">
diff --git a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml b/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
index d366d6bf0..077050208 100644
--- a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
@@ -42,7 +42,7 @@
 					</property>
 					<property name="tasklet">
 						<bean
-							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 							<property name="itemReader">
 								<bean
 									class="org.springframework.batch.item.reader.ValidatingItemReader">
@@ -64,7 +64,7 @@
 				<bean id="step2" parent="simpleStep">
 					<property name="tasklet">
 						<bean
-							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 							<property name="itemReader"
 								ref="tradeSqlItemReader" />
 							<property name="itemWriter">
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
index 83dbb8706..4497e2fb4 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
@@ -19,7 +19,7 @@
 				<bean id="step1" parent="simpleStep">
 					<property name="tasklet">
 						<bean
-							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 							<property name="itemReader">
 								<bean
 									class="org.springframework.batch.item.reader.ValidatingItemReader">
@@ -40,7 +40,7 @@
 				<bean id="step2" parent="simpleStep">
 					<property name="tasklet">
 						<bean
-							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 							<property name="itemReader" ref="tradeSqlItemReader" />
 							<property name="itemWriter">
 								<bean
@@ -53,7 +53,7 @@
 				<bean id="step3" parent="simpleStep">
 					<property name="tasklet">
 						<bean
-							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+							class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 							<property name="itemReader" ref="customerSqlItemReader" />
 							<property name="itemWriter">
 								<bean
diff --git a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
index 647e6078d..daa942364 100644
--- a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml
@@ -19,7 +19,7 @@
 			<bean id="step1" parent="simpleStep">
 				<property name="tasklet">
 					<bean
-						class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
+						class="org.springframework.batch.execution.tasklet.ItemOrientedTasklet">
 						<property name="itemReader">
 							<bean
 								class="org.springframework.batch.io.xml.StaxEventItemReader"