diff --git a/src/main/org/apache/tools/ant/Target.java b/src/main/org/apache/tools/ant/Target.java
index 1da28de48..407e4cd93 100644
--- a/src/main/org/apache/tools/ant/Target.java
+++ b/src/main/org/apache/tools/ant/Target.java
@@ -222,7 +222,7 @@ public class Target implements TaskContainer {
             return true;
         }
         
-        String test = ProjectHelper.replaceProperties(getProject(), ifCondition, getProject().getProperties());
+        String test = ProjectHelper.replaceProperties(getProject(), ifCondition);
         return project.getProperty(test) != null;
     }
 
@@ -230,7 +230,7 @@ public class Target implements TaskContainer {
         if ("".equals(unlessCondition)) {
             return true;
         }
-        String test = ProjectHelper.replaceProperties(getProject(), unlessCondition, getProject().getProperties());
+        String test = ProjectHelper.replaceProperties(getProject(), unlessCondition);
         return project.getProperty(test) == null;
     }
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/Echo.java b/src/main/org/apache/tools/ant/taskdefs/Echo.java
index d3f09cd47..21f286dbc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Echo.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Echo.java
@@ -128,7 +128,7 @@ public class Echo extends Task {
      */
     public void addText(String msg) {
         message += 
-            ProjectHelper.replaceProperties(project, msg, project.getProperties());
+            ProjectHelper.replaceProperties(project, msg);
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/Exit.java b/src/main/org/apache/tools/ant/taskdefs/Exit.java
index 8687a5819..f7f94292a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Exit.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Exit.java
@@ -84,7 +84,7 @@ public class Exit extends Task {
      */
     public void addText(String msg) {
         message += 
-            ProjectHelper.replaceProperties(project, msg, project.getProperties());
+            ProjectHelper.replaceProperties(project, msg);
     }
 
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/Input.java b/src/main/org/apache/tools/ant/taskdefs/Input.java
index 72793c74f..0e2587987 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Input.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Input.java
@@ -204,7 +204,7 @@ public class Input extends Task {
      */
     public void addText(String msg) {
         message +=
-            ProjectHelper.replaceProperties(project, msg, project.getProperties());
+            ProjectHelper.replaceProperties(project, msg);
     }
 }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index 7383da285..7b6b1bb09 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -1146,8 +1146,7 @@ public class Javadoc extends Task {
      * Convenience method to expand properties.
      */
     protected String expand(String content) {
-        return ProjectHelper.replaceProperties(project, content,
-                                               project.getProperties());
+        return ProjectHelper.replaceProperties(project, content);
     }
 
     private String getJavadocExecutableName()
diff --git a/src/main/org/apache/tools/ant/taskdefs/Property.java b/src/main/org/apache/tools/ant/taskdefs/Property.java
index f12bd409e..d13308890 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Property.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Property.java
@@ -280,7 +280,7 @@ public class Property extends Task {
             String name = (String) e.nextElement();
             String value = (String) props.getProperty(name);
 
-            String v = ProjectHelper.replaceProperties(project, value, project.getProperties());
+            String v = ProjectHelper.replaceProperties(project, value);
             addProperty(name, v);
         }
     }
diff --git a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
index 5020e53bc..129c52ac4 100644
--- a/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
@@ -533,8 +533,7 @@ public class SQLExec extends Task {
         try{
             while ((line=in.readLine()) != null){
                 line = line.trim();
-                line = ProjectHelper.replaceProperties(project, line,
-                                                       project.getProperties());
+                line = ProjectHelper.replaceProperties(project, line);
                 if (line.startsWith("//")) continue;
                 if (line.startsWith("--")) continue;
                 StringTokenizer st = new StringTokenizer(line);
diff --git a/src/main/org/apache/tools/ant/types/PatternSet.java b/src/main/org/apache/tools/ant/types/PatternSet.java
index ff39e5a3f..66dc748db 100644
--- a/src/main/org/apache/tools/ant/types/PatternSet.java
+++ b/src/main/org/apache/tools/ant/types/PatternSet.java
@@ -291,8 +291,7 @@ public class PatternSet extends DataType {
             String line = patternReader.readLine();
             while (line != null) {
                 if (line.length() > 0) {
-                    line = ProjectHelper.replaceProperties(p, line,
-                                                           p.getProperties());
+                    line = ProjectHelper.replaceProperties(p, line);
                     addPatternToList(patternlist).setName(line);
                 }
                 line = patternReader.readLine();