diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index eef2eb61e9f..595fb330b62 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.62 2009/09/12 15:51:52 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.63 2009/11/10 18:53:38 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -612,17 +612,6 @@ remove_tablespace_directories(Oid tablespaceoid, bool redo)
 							subfile)));
 
 		pfree(subfile);
-
-		/*
-		 * OS X 10.6 and 10.6.1 have a bug in readdir() that causes the
-		 * next call to fail after deleting the current element.  Hopefully
-		 * that will be fixed real soon, but for the moment we have this
-		 * ugly kluge to restart the directory scan.
-		 */
-#ifdef __darwin__
-		FreeDir(dirdesc);
-		dirdesc = AllocateDir(location);
-#endif
 	}
 
 	FreeDir(dirdesc);