diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index 724b2d3c2..15113bc62 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -381,7 +381,7 @@ public class Project {
      */
     public String replaceProperties(String value)
         throws BuildException { 
-        return ProjectHelper.replaceProperties(this, value);
+        return ProjectHelper.replaceProperties(this, value, properties);
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java
index 76abb8476..f5022e02c 100644
--- a/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -737,7 +737,7 @@ public class ProjectHelper {
      */
      public static String replaceProperties(Project project, String value)
             throws BuildException {
-         return replaceProperties(project,value,project.getProperties());
+         return project.replaceProperties(value);
      }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java b/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
index f78b3157b..e17b8a973 100644
--- a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
@@ -56,7 +56,6 @@ package org.apache.tools.ant.taskdefs;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.ProjectHelper;
 
 
 import java.io.*;
@@ -205,7 +204,7 @@ public class LoadFile extends Task {
                 text=stripLineBreaks(text);
             }
             if(evaluateProperties) {
-                text=ProjectHelper.replaceProperties(project,text);
+                text = project.replaceProperties(text);
             }
             project.setNewProperty(property, text);
             log("loaded "+buffer.length+" characters",Project.MSG_VERBOSE);