diff --git a/include/clang/Lex/Lexer.h b/include/clang/Lex/Lexer.h
index ac32f5c..77399e6 100644
--- a/include/clang/Lex/Lexer.h
+++ b/include/clang/Lex/Lexer.h
@@ -173,7 +173,6 @@
   /// Diag - Forwarding function for diagnostics.  This translate a source
   /// position in the current buffer into a SourceLocation object for rendering.
   DiagnosticBuilder Diag(const char *Loc, unsigned DiagID) const;
-  DiagnosticBuilder Diag(SourceLocation Loc, unsigned DiagID) const;
 
   /// getSourceLocation - Return a source location identifier for the specified
   /// offset in the current file.
diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp
index cef848f..b4d0717 100644
--- a/lib/Lex/Lexer.cpp
+++ b/lib/Lex/Lexer.cpp
@@ -313,11 +313,6 @@
   return PP->Diag(getSourceLocation(Loc), DiagID);
 }
 
-DiagnosticBuilder Lexer::Diag(SourceLocation Loc, unsigned DiagID) const {
-  return PP->Diag(Loc, DiagID);
-}
-
-
 //===----------------------------------------------------------------------===//
 // Trigraph and Escaped Newline Handling Code.
 //===----------------------------------------------------------------------===//
@@ -1153,7 +1148,8 @@
 
   // If we are in a #if directive, emit an error.
   while (!ConditionalStack.empty()) {
-    Diag(ConditionalStack.back().IfLoc, diag::err_pp_unterminated_conditional);
+    PP->Diag(ConditionalStack.back().IfLoc,
+             diag::err_pp_unterminated_conditional);
     ConditionalStack.pop_back();
   }