diff --git a/include/clang/Basic/DiagnosticKinds.def b/include/clang/Basic/DiagnosticKinds.def
index b091e20..64afc46 100644
--- a/include/clang/Basic/DiagnosticKinds.def
+++ b/include/clang/Basic/DiagnosticKinds.def
@@ -1291,8 +1291,6 @@
      "ambiguous conversion from derived class '%0' to base class '%1':%2")
 
 // C++ operator overloading
-DIAG(err_expected_operator, ERROR,
-     "expected 'operator' keyword")
 DIAG(err_operator_overload_needs_class_or_enum, ERROR,
      "non-member overloaded operator '%0' must have at least one parameter of class or enumeration type (or reference thereof)")
 DIAG(err_operator_overload_variadic, ERROR,
diff --git a/lib/Parse/ParseExprCXX.cpp b/lib/Parse/ParseExprCXX.cpp
index fcb229b..3134ff8 100644
--- a/lib/Parse/ParseExprCXX.cpp
+++ b/lib/Parse/ParseExprCXX.cpp
@@ -308,8 +308,7 @@
 ///            <=    >=   && ||   ++ --   ,   ->* ->
 ///            ()    []
 IdentifierInfo *Parser::MaybeParseOperatorFunctionId() {
-  if (Tok.isNot(tok::kw_operator))
-    return 0;
+  assert(Tok.is(tok::kw_operator) && "Expected 'operator' keyword");
 
   OverloadedOperatorKind Op = OO_None;
   switch (NextToken().getKind()) {
@@ -361,7 +360,7 @@
   if (Op == OO_None)
     return 0;
   else {
-    ExpectAndConsume(tok::kw_operator, diag::err_expected_operator);
+    ConsumeToken(); // 'operator'
     ConsumeAnyToken(); // the operator itself
     return &PP.getIdentifierTable().getOverloadedOperator(Op);
   }