diff --git a/org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyAnnotationFormatterFactory.java b/org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyAnnotationFormatterFactory.java
deleted file mode 100644
index f28f8b6142f..00000000000
--- a/org.springframework.context/src/main/java/org/springframework/ui/format/number/CurrencyAnnotationFormatterFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2004-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.ui.format.number;
-
-import java.math.BigDecimal;
-
-import org.springframework.ui.format.AnnotationFormatterFactory;
-import org.springframework.ui.format.Formatter;
-
-/**
- * Returns a CurrencyFormatter for properties annotated with the {@link CurrencyFormat} annotation.
- * @author Keith Donald
- */
-public class CurrencyAnnotationFormatterFactory implements AnnotationFormatterFactory<CurrencyFormat, BigDecimal> {
-	public Formatter<BigDecimal> getFormatter(CurrencyFormat annotation) {
-		return new CurrencyFormatter();
-	}
-}
diff --git a/org.springframework.context/src/test/java/org/springframework/ui/binding/support/GenericBinderTests.java b/org.springframework.context/src/test/java/org/springframework/ui/binding/support/GenericBinderTests.java
index 427bd40438d..6a05cb0da13 100644
--- a/org.springframework.context/src/test/java/org/springframework/ui/binding/support/GenericBinderTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/ui/binding/support/GenericBinderTests.java
@@ -25,8 +25,9 @@ import org.springframework.ui.binding.Binding;
 import org.springframework.ui.binding.BindingConfiguration;
 import org.springframework.ui.binding.BindingResult;
 import org.springframework.ui.binding.UserValues;
+import org.springframework.ui.format.AnnotationFormatterFactory;
+import org.springframework.ui.format.Formatter;
 import org.springframework.ui.format.date.DateFormatter;
-import org.springframework.ui.format.number.CurrencyAnnotationFormatterFactory;
 import org.springframework.ui.format.number.CurrencyFormat;
 import org.springframework.ui.format.number.CurrencyFormatter;
 import org.springframework.ui.format.number.IntegerFormatter;
@@ -378,4 +379,11 @@ public class GenericBinderTests {
 		}
 		
 	}
+	
+	public static class CurrencyAnnotationFormatterFactory implements AnnotationFormatterFactory<CurrencyFormat, BigDecimal> {
+		public Formatter<BigDecimal> getFormatter(CurrencyFormat annotation) {
+			return new CurrencyFormatter();
+		}
+	}
+
 }
diff --git a/org.springframework.context/src/test/java/org/springframework/ui/binding/support/WebBinderTests.java b/org.springframework.context/src/test/java/org/springframework/ui/binding/support/WebBinderTests.java
index ffec0d3ec5d..4abb54cfebb 100644
--- a/org.springframework.context/src/test/java/org/springframework/ui/binding/support/WebBinderTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/ui/binding/support/WebBinderTests.java
@@ -19,8 +19,8 @@ import org.springframework.ui.binding.BindingConfiguration;
 import org.springframework.ui.binding.BindingResult;
 import org.springframework.ui.binding.UserValues;
 import org.springframework.ui.format.date.DateFormatter;
-import org.springframework.ui.format.number.CurrencyAnnotationFormatterFactory;
 import org.springframework.ui.format.number.CurrencyFormat;
+import org.springframework.ui.format.number.CurrencyFormatter;
 
 public class WebBinderTests {
 
@@ -39,7 +39,7 @@ public class WebBinderTests {
 	
 	@Test
 	public void bindUserValuesCreatedFromUserMap() throws ParseException {
-		binder.add(new CurrencyAnnotationFormatterFactory());
+		binder.add(new CurrencyFormatter(), CurrencyFormat.class);
 		binder.add(new BindingConfiguration("date", new DateFormatter()));
 		Map<String, String> userMap = new LinkedHashMap<String, String>();
 		userMap.put("string", "test");