diff --git a/clang/lib/AST/DeclObjC.cpp b/clang/lib/AST/DeclObjC.cpp
index f3d81a1aa509..b3fc131330ee 100644
--- a/clang/lib/AST/DeclObjC.cpp
+++ b/clang/lib/AST/DeclObjC.cpp
@@ -79,13 +79,11 @@ void ObjCInterfaceDecl::Destroy(ASTContext& C) {
   
   for (classmeth_iterator I=classmeth_begin(), E=classmeth_end(); I!=E; ++I)
     if (*I) (*I)->Destroy(C);
-  
-  // FIXME: Cannot destroy properties right now because the properties of
-  //  both the super class and this class are in this array.  This can
-  //  cause double-deletions.
-  //for (classprop_iterator I=classprop_begin(), E=classprop_end(); I!=E; ++I)
-//    if (*I) (*I)->Destroy(C);
-//  
+
+  // FIXME: Because there is no clear ownership
+  //  role between ObjCInterfaceDecls and the ObjCPropertyDecls that they
+  //  reference, we destroy ObjCPropertyDecls in ~TranslationUnit.
+
   Decl::Destroy(C);
 }
 
diff --git a/clang/lib/AST/TranslationUnit.cpp b/clang/lib/AST/TranslationUnit.cpp
index f8416f18fa1d..e78502f267d6 100644
--- a/clang/lib/AST/TranslationUnit.cpp
+++ b/clang/lib/AST/TranslationUnit.cpp
@@ -37,6 +37,20 @@ TranslationUnit::~TranslationUnit() {
       if (Killed.count(*I)) continue;
 
       Killed.insert(*I);
+      
+      // FIXME: This is a horrible hack.  Because there is no clear ownership
+      //  role between ObjCInterfaceDecls and the ObjCPropertyDecls that they
+      //  reference, we need to destroy ObjCPropertyDecls here.  This will
+      //  eventually be fixed when the ownership of ObjCPropertyDecls gets
+      //  cleaned up.
+      if (ObjCInterfaceDecl* IDecl = dyn_cast<ObjCInterfaceDecl>(*I))
+        for (ObjCInterfaceDecl::classprop_iterator ID=IDecl->classprop_begin(),
+             ED=IDecl->classprop_end(); ID!=ED; ++ID) {
+          if (Killed.count(*ID)) continue;
+          Killed.insert(*ID);
+          (*ID)->Destroy(*Context);
+        }
+      
       (*I)->Destroy(*Context);
     }
   }