diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 346d604cd..1c8faebcb 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -124,7 +124,7 @@ public abstract class AbstractFileSet extends DataType
      * Retrieves the base-directory for this instance.
      * @return <code>File</code>.
      */
-    public synchronized File getDir() {
+    public File getDir() {
         return getDir(getProject());
     }
 
@@ -425,6 +425,15 @@ public abstract class AbstractFileSet extends DataType
         return ds;
     }
 
+    /**
+     * Set up the specified directory scanner against this
+     * AbstractFileSet's Project.
+     * @param ds a <code>FileScanner</code> instance.
+     */
+    public void setupDirectoryScanner(FileScanner ds) {
+        setupDirectoryScanner(ds, getProject());
+    }
+
     /**
      * Set up the specified directory scanner against the specified project.
      * @param ds a <code>FileScanner</code> instance.