diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 02bedca..1e553e3 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -431,7 +431,6 @@
     // alignment requirements: getPointerInfo should take an AddrSpace.
     return getTypeInfo(QualType(cast<ExtQualType>(T)->getBaseType(), 0));
   case Type::ObjCQualifiedId:
-  case Type::ObjCQualifiedClass:
   case Type::ObjCQualifiedInterface:
     Width = Target.getPointerWidth(0);
     Align = Target.getPointerAlign(0);
@@ -3136,9 +3135,6 @@
   case Type::FixedWidthInt:
     // Distinct fixed-width integers are not compatible.
     return QualType();
-  case Type::ObjCQualifiedClass:
-    // Distinct qualified classes are not compatible.
-    return QualType();
   case Type::ExtQual:
     // FIXME: ExtQual types can be compatible even if they're not
     // identical!
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
index 97245c6..7daa207 100644
--- a/lib/AST/Type.cpp
+++ b/lib/AST/Type.cpp
@@ -768,8 +768,7 @@
          isa<BlockPointerType>(CanonicalType) ||
          isa<MemberPointerType>(CanonicalType) ||
          isa<ComplexType>(CanonicalType) ||
-         isa<ObjCQualifiedIdType>(CanonicalType) ||
-         isa<ObjCQualifiedClassType>(CanonicalType);
+         isa<ObjCQualifiedIdType>(CanonicalType);
 }
 
 /// \brief Determines whether the type is a C++ aggregate type or C