diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java
index dad6e100a..345f1d194 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java
@@ -68,8 +68,7 @@ import org.springframework.util.ClassUtils;
  * @author Dave Syer
  * @author Mahmoud Ben Hassine
  */
-public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, InitializingBean,
-		Observation.KeyValuesProviderAware<BatchJobKeyValuesProvider> {
+public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, InitializingBean {
 
 	protected static final Log logger = LogFactory.getLog(AbstractJob.class);
 
@@ -434,7 +433,6 @@ public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, In
 		jobRepository.update(jobExecution);
 	}
 
-	@Override
 	public void setKeyValuesProvider(BatchJobKeyValuesProvider keyValuesProvider) {
 		this.keyValuesProvider = keyValuesProvider;
 	}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
index 785a6f008..da2e90b74 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
@@ -60,8 +60,7 @@ import org.springframework.util.ClassUtils;
  * @author Chris Schaefer
  * @author Mahmoud Ben Hassine
  */
-public abstract class AbstractStep
-		implements Step, InitializingBean, BeanNameAware, Observation.KeyValuesProviderAware<BatchStepTagsProvider> {
+public abstract class AbstractStep implements Step, InitializingBean, BeanNameAware {
 
 	private static final Log logger = LogFactory.getLog(AbstractStep.class);
 
@@ -419,7 +418,6 @@ public abstract class AbstractStep
 		return exitStatus;
 	}
 
-	@Override
 	public void setKeyValuesProvider(BatchStepTagsProvider keyValuesProvider) {
 		this.keyValuesProvider = keyValuesProvider;
 	}