diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index aefb3b134..d092de743 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-13  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* boot-9.scm (environment-module): Change eval-closure-module call
+	back to procedure-property lookup.  (This completes the reversion
+	of the change made on 2005-06-10, which was only partially undone
+	by the change on 2005-08-01.)
+
 2006-10-05  Kevin Ryde  <user42@zip.com.au>
 
 	* ftw.scm (visited?-proc): Use hashv since we know we're getting
diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index 748b523b5..eb550bb2b 100644
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -258,7 +258,7 @@
 
 (define (environment-module env)
   (let ((closure (and (pair? env) (car (last-pair env)))))
-    (and closure (eval-closure-module closure))))
+    (and closure (procedure-property closure 'module))))
 
 
 ;;; {Records}