diff --git a/CHANGES.current b/CHANGES.current
index 5f2d1c8d3..05a23c2d9 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.2 (in progress)
 ===========================
 
+2011-02-18: olly
+	    [PHP] Fix invalid erase during iteration of std::map in generated
+	    director code.  Reported by Cory Bennett in SF#3175820.
+
 2011-02-17: wsfulton
             Preprocessing now warns if extra tokens appear after #else and #end.
 
diff --git a/Lib/php/director.swg b/Lib/php/director.swg
index 163cd7fb6..e625f8acb 100644
--- a/Lib/php/director.swg
+++ b/Lib/php/director.swg
@@ -106,12 +106,6 @@ namespace Swig {
       Director(zval* self) : swig_self(self) {
       }
 
-      ~Director() {
-        for (swig_ownership_map::iterator i = swig_owner.begin(); i != swig_owner.end(); i++) {
-          swig_owner.erase(i);
-        }
-      }
-
       bool swig_is_overridden_method(char *cname, char *lc_fname) {
         zval classname;
         zend_class_entry **ce;