diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index b2300e0249d4..f3ce0e9b548c 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -2966,13 +2966,13 @@ void ASTReader::InitializeContext(ASTContext &Ctx) {
     Context->setBuiltinVaListType(
       GetType(SpecialTypes[SPECIAL_TYPE_BUILTIN_VA_LIST]));
     if (unsigned Id = SpecialTypes[SPECIAL_TYPE_OBJC_ID])
-      Context->setObjCIdType(GetType(Id));
+      Context->ObjCIdTypedefType = GetType(Id);
     if (unsigned Sel = SpecialTypes[SPECIAL_TYPE_OBJC_SELECTOR])
-      Context->setObjCSelType(GetType(Sel));
+      Context->ObjCSelTypedefType = GetType(Sel);
     if (unsigned Proto = SpecialTypes[SPECIAL_TYPE_OBJC_PROTOCOL])
-      Context->setObjCProtoType(GetType(Proto));
+      Context->ObjCProtoType = GetType(Proto);
     if (unsigned Class = SpecialTypes[SPECIAL_TYPE_OBJC_CLASS])
-      Context->setObjCClassType(GetType(Class));
+      Context->ObjCClassTypedefType = GetType(Class);
 
     if (unsigned String = SpecialTypes[SPECIAL_TYPE_CF_CONSTANT_STRING])
       Context->setCFConstantStringType(GetType(String));
diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp
index 1b33efc1056c..fe747a5150f9 100644
--- a/clang/lib/Serialization/ASTWriter.cpp
+++ b/clang/lib/Serialization/ASTWriter.cpp
@@ -2929,10 +2929,10 @@ void ASTWriter::WriteASTCore(Sema &SemaRef, MemorizeStatCalls *StatCalls,
   // Form the record of special types.
   RecordData SpecialTypes;
   AddTypeRef(Context.getBuiltinVaListType(), SpecialTypes);
-  AddTypeRef(Context.getObjCIdType(), SpecialTypes);
-  AddTypeRef(Context.getObjCSelType(), SpecialTypes);
-  AddTypeRef(Context.getObjCProtoType(), SpecialTypes);
-  AddTypeRef(Context.getObjCClassType(), SpecialTypes);
+  AddTypeRef(Context.ObjCIdTypedefType, SpecialTypes);
+  AddTypeRef(Context.ObjCSelTypedefType, SpecialTypes);
+  AddTypeRef(Context.ObjCProtoType, SpecialTypes);
+  AddTypeRef(Context.ObjCClassTypedefType, SpecialTypes);
   AddTypeRef(Context.getRawCFConstantStringType(), SpecialTypes);
   AddTypeRef(Context.getFILEType(), SpecialTypes);
   AddTypeRef(Context.getjmp_bufType(), SpecialTypes);