diff --git a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormattingConfigurer.java b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormattingConfigurer.java
index bb624541c7f..313fa803564 100644
--- a/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormattingConfigurer.java
+++ b/org.springframework.context/src/main/java/org/springframework/format/datetime/joda/JodaTimeFormattingConfigurer.java
@@ -111,9 +111,7 @@ public class JodaTimeFormattingConfigurer {
 
 		Printer<ReadableInstant> readableInstantPrinter = new ReadableInstantPrinter(jodaDateTimeFormatter);
 		formatterRegistry.addFormatterForFieldType(ReadableInstant.class, readableInstantPrinter, dateTimeParser);
-		formatterRegistry.addFormatterForFieldType(Calendar.class, readableInstantPrinter, dateTimeParser);
-		formatterRegistry.addFormatterForFieldType(Date.class, new MillisecondInstantPrinter(jodaDateTimeFormatter), dateTimeParser);
-		
+
 		formatterRegistry.addFormatterForFieldAnnotation(new DateTimeFormatAnnotationFormatterFactory());
 	}
 
diff --git a/org.springframework.context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java b/org.springframework.context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java
index 52ff285a092..b1d1fbd21be 100644
--- a/org.springframework.context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java
@@ -292,11 +292,13 @@ public class JodaTimeFormattingTests {
 		@DateTimeFormat(style="MS")
 		private DateTime dateTimeAnnotated;
 
+		@DateTimeFormat
 		private Date date;
 
 		@DateTimeFormat(style="S-")
 		private Date dateAnnotated;
 
+		@DateTimeFormat
 		private Calendar calendar;
 
 		@DateTimeFormat(style="S-")
diff --git a/org.springframework.context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java b/org.springframework.context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
deleted file mode 100644
index 7afa524310c..00000000000
--- a/org.springframework.context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2002-2009 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.format.support;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.Locale;
-
-import org.junit.After;
-import static org.junit.Assert.*;
-import org.junit.Before;
-import org.junit.Test;
-
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.core.convert.ConversionService;
-
-/**
- * @author Keith Donald
- * @author Juergen Hoeller
- */
-public class FormattingConversionServiceFactoryBeanTests {
-
-	private ConversionService conversionService;
-
-	@Before
-	public void setUp() {
-		FormattingConversionServiceFactoryBean factory = new FormattingConversionServiceFactoryBean();
-		factory.afterPropertiesSet();
-		this.conversionService = factory.getObject();
-		LocaleContextHolder.setLocale(Locale.US);
-	}
-
-	@After
-	public void tearDown() {
-		LocaleContextHolder.setLocale(null);
-	}
-
-	@Test
-	public void testFormatNumber() {
-		BigDecimal value = conversionService.convert("3000.25", BigDecimal.class);
-		assertEquals("3000.25", conversionService.convert(value, String.class));
-	}
-	
-	@Test
-	public void testFormatDate() {
-		Date value = conversionService.convert("10/29/09 12:00 PM", Date.class);
-		assertEquals("10/29/09 12:00 PM", conversionService.convert(value, String.class));
-	}
-
-}