diff --git a/include/boost/range/adaptor/replaced.hpp b/include/boost/range/adaptor/replaced.hpp
index 761ba20..42eb52a 100644
--- a/include/boost/range/adaptor/replaced.hpp
+++ b/include/boost/range/adaptor/replaced.hpp
@@ -101,10 +101,9 @@ namespace boost
             void operator=(const replace_holder&);
         };
 
-        template< class SinglePassRange, 
-                  class RangeValueType = BOOST_DEDUCED_TYPENAME range_value<SinglePassRange>::type>
+        template< class SinglePassRange, class Value >
         inline replaced_range<SinglePassRange>
-        operator|(SinglePassRange& r, const replace_holder<RangeValueType>& f)
+        operator|(SinglePassRange& r, const replace_holder<Value>& f)
         {
             BOOST_RANGE_CONCEPT_ASSERT((
                 SinglePassRangeConcept<SinglePassRange>));
@@ -112,10 +111,9 @@ namespace boost
             return replaced_range<SinglePassRange>(r, f.val1, f.val2);
         }
 
-        template< class SinglePassRange,
-                  class RangeValueType = BOOST_DEDUCED_TYPENAME range_value<SinglePassRange>::type>
+        template< class SinglePassRange, class Value >
         inline replaced_range<const SinglePassRange>
-        operator|(const SinglePassRange& r, const replace_holder<RangeValueType>& f)
+        operator|(const SinglePassRange& r, const replace_holder<Value>& f)
         {
             BOOST_RANGE_CONCEPT_ASSERT((
                 SinglePassRangeConcept<const SinglePassRange>));
@@ -135,10 +133,9 @@ namespace boost
                     range_detail::forwarder2<range_detail::replace_holder>();
         }
 
-        template< class SinglePassRange,
-                  class RangeValueType = BOOST_DEDUCED_TYPENAME range_value<SinglePassRange>::type>
+        template< class SinglePassRange, class Value >
         inline replaced_range<SinglePassRange>
-        replace(SinglePassRange& rng, RangeValueType from, RangeValueType to)
+        replace(SinglePassRange& rng, Value from, Value to)
         {
             BOOST_RANGE_CONCEPT_ASSERT((
                 SinglePassRangeConcept<SinglePassRange>));
@@ -146,10 +143,9 @@ namespace boost
             return replaced_range<SinglePassRange>(rng, from, to);
         }
 
-        template< class SinglePassRange,
-                  class RangeValueType = BOOST_DEDUCED_TYPENAME range_value<SinglePassRange>::type>
+        template< class SinglePassRange, class Value >
         inline replaced_range<const SinglePassRange>
-        replace(const SinglePassRange& rng, RangeValueType from, RangeValueType to)
+        replace(const SinglePassRange& rng, Value from, Value to)
         {
             BOOST_RANGE_CONCEPT_ASSERT((
                 SinglePassRangeConcept<const SinglePassRange>));