diff --git a/lib/Frontend/PCHReaderDecl.cpp b/lib/Frontend/PCHReaderDecl.cpp
index fe11ca7..3fc159a 100644
--- a/lib/Frontend/PCHReaderDecl.cpp
+++ b/lib/Frontend/PCHReaderDecl.cpp
@@ -590,6 +590,9 @@
   }
   }
 
+  // FIXME: Hack. See PCHDeclWriter::VisitTypeDecl.
+  D->setTypeForDecl(Reader.GetType(Record[Idx++]).getTypePtr());
+
   // FIXME: this is far from complete
 
   if (D->isDefinition()) {
diff --git a/lib/Frontend/PCHWriterDecl.cpp b/lib/Frontend/PCHWriterDecl.cpp
index 0671710..a704d67 100644
--- a/lib/Frontend/PCHWriterDecl.cpp
+++ b/lib/Frontend/PCHWriterDecl.cpp
@@ -136,7 +136,14 @@
 
 void PCHDeclWriter::VisitTypeDecl(TypeDecl *D) {
   VisitNamedDecl(D);
-  Writer.AddTypeRef(QualType(D->getTypeForDecl(), 0), Record);
+  if (isa<CXXRecordDecl>(D)) {
+    // FIXME: Hack. To read a templated CXXRecordDecl from PCH, we need an
+    // initialized CXXRecordDecl before creating an InjectedClassNameType.
+    // Delay emitting/reading CXXRecordDecl's TypeForDecl until when we handle
+    // CXXRecordDecl emitting/initialization.
+    Writer.AddTypeRef(QualType(), Record);
+  } else
+    Writer.AddTypeRef(QualType(D->getTypeForDecl(), 0), Record);
 }
 
 void PCHDeclWriter::VisitTypedefDecl(TypedefDecl *D) {
@@ -591,6 +598,9 @@
     Record.push_back(CXXRecNotTemplate);
   }
 
+  // FIXME: Hack. See PCHDeclWriter::VisitTypeDecl.
+  Writer.AddTypeRef(QualType(D->getTypeForDecl(), 0), Record);
+
   if (D->isDefinition()) {
     unsigned NumBases = D->getNumBases();
     Record.push_back(NumBases);