diff --git a/include/clang/AST/Attr.h b/include/clang/AST/Attr.h
index 1af49f1..9e9c858 100644
--- a/include/clang/AST/Attr.h
+++ b/include/clang/AST/Attr.h
@@ -68,10 +68,6 @@
 
   Kind getKind() const { return AttrKind; }
 
-  bool hasKind(Kind kind) const {
-    return AttrKind == kind;
-  }
-
   Attr *getNext() { return Next; }
   const Attr *getNext() const { return Next; }
   void setNext(Attr *next) { Next = next; }
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 3f86e52..cf1a525 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -235,10 +235,10 @@
       continue;
     }
     for (const Attr *attr = PDecl->getAttrs(); attr; attr = attr->getNext()) {
-      if (attr->hasKind(Attr::Unavailable))
+      if (attr->getKind() == Attr::Unavailable)
         Diag(ProtocolId[i].second, diag::warn_unavailable) << 
           PDecl->getDeclName();
-      if (attr->hasKind(Attr::Deprecated))
+      if (attr->getKind() == Attr::Deprecated)
         Diag(ProtocolId[i].second, diag::warn_deprecated) << 
           PDecl->getDeclName();
     }