diff --git a/clang/include/clang/Basic/DiagnosticKinds.def b/clang/include/clang/Basic/DiagnosticKinds.def
index ed7bdec4b570..d2c82dafc86d 100644
--- a/clang/include/clang/Basic/DiagnosticKinds.def
+++ b/clang/include/clang/Basic/DiagnosticKinds.def
@@ -1309,8 +1309,6 @@ DIAG(err_array_new_needs_size, ERROR,
      "array size must be specified in new expressions")
 DIAG(err_bad_new_type, ERROR,
     "cannot allocate %select{function|incomplete|reference}1 type %0 with new")
-DIAG(err_invalid_qualified_new_delete, ERROR,
-    "invalid use of ::%select{new|delete}0")
 DIAG(err_new_array_nonconst, ERROR,
      "only the first dimension of an allocated array may be non-const")
 DIAG(err_array_size_not_integral, ERROR,
diff --git a/clang/include/clang/Parse/Parser.h b/clang/include/clang/Parse/Parser.h
index ee748503f67f..070faa16bb3d 100644
--- a/clang/include/clang/Parse/Parser.h
+++ b/clang/include/clang/Parse/Parser.h
@@ -269,7 +269,7 @@ private:
   /// for expressions in C.
   ///
   /// This returns true if the token was annotated.
-  bool TryAnnotateTypeOrScopeToken(const Token *GlobalQualifier = 0);
+  bool TryAnnotateTypeOrScopeToken();
 
   /// TryAnnotateCXXScopeToken - Like TryAnnotateTypeOrScopeToken but only
   /// annotates C++ scope specifiers.  This returns true if the token was
@@ -610,11 +610,9 @@ private:
 
   /// MaybeParseCXXScopeSpecifier - Parse global scope or nested-name-specifier.
   /// Returns true if a nested-name-specifier was parsed from the token stream.
+  /// Note that this routine will not parse ::new or ::delete.
   ///
-  /// If GlobalQualifier is non-null, then it is a :: token we should use as the
-  /// global qualifier.
-  bool MaybeParseCXXScopeSpecifier(CXXScopeSpec &SS,
-                                   const Token *GlobalQualifier = 0);
+  bool MaybeParseCXXScopeSpecifier(CXXScopeSpec &SS);
   
   //===--------------------------------------------------------------------===//
   // C++ 5.2p1: C++ Casts
diff --git a/clang/lib/Parse/ParseExpr.cpp b/clang/lib/Parse/ParseExpr.cpp
index 80e25ee6cb6f..c2bbad3cda10 100644
--- a/clang/lib/Parse/ParseExpr.cpp
+++ b/clang/lib/Parse/ParseExpr.cpp
@@ -626,25 +626,21 @@ Parser::OwningExprResult Parser::ParseCastExpression(bool isUnaryExpression) {
     return ParsePostfixExpressionSuffix(move(Res));
 
   case tok::coloncolon: {
+    // ::foo::bar -> global qualified name etc.   If TryAnnotateTypeOrScopeToken
+    // annotates the token, tail recurse.
+    if (TryAnnotateTypeOrScopeToken())
+      return ParseCastExpression(isUnaryExpression);
+    
     // ::new -> [C++] new-expression
     // ::delete -> [C++] delete-expression
-    // ::foo::bar -> global qualified name etc. 
-    Token ColonColonTok = Tok;
-    ConsumeToken();
+    SourceLocation CCLoc = ConsumeToken();
     if (Tok.is(tok::kw_new))
-      return ParseCXXNewExpression(true, ColonColonTok.getLocation());
+      return ParseCXXNewExpression(true, CCLoc);
     if (Tok.is(tok::kw_delete))
-      return ParseCXXDeleteExpression(true, ColonColonTok.getLocation());
-    // Turn the qualified name into a annot_qualtypename or annot_cxxscope if
-    // it would be valid.
-    if ((Tok.is(tok::identifier) || Tok.is(tok::coloncolon)) &&
-        TryAnnotateTypeOrScopeToken(&ColonColonTok)) {
-      // If so, retry (tail recurse).
-      return ParseCastExpression(isUnaryExpression);
-    }
-      
+      return ParseCXXDeleteExpression(true, CCLoc);
+    
     // This is not a type name or scope specifier, it is an invalid expression.
-    Diag(ColonColonTok, diag::err_expected_expression);
+    Diag(CCLoc, diag::err_expected_expression);
     return ExprError();
   }
 
diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp
index 3ff9f4427c39..c7c6be915265 100644
--- a/clang/lib/Parse/ParseExprCXX.cpp
+++ b/clang/lib/Parse/ParseExprCXX.cpp
@@ -20,8 +20,7 @@ using namespace clang;
 /// MaybeParseCXXScopeSpecifier - Parse global scope or nested-name-specifier.
 /// Returns true if a nested-name-specifier was parsed from the token stream.
 /// 
-/// Note that this routine emits an error if you call it with ::new or ::delete
-/// as the current tokens, so only call it in contexts where these are invalid.
+/// Note that this routine will not parse ::new or ::delete.
 ///
 ///       '::'[opt] nested-name-specifier
 ///       '::'
@@ -32,42 +31,25 @@ using namespace clang;
 ///         nested-name-specifier identifier '::'
 ///         nested-name-specifier 'template'[opt] simple-template-id '::' [TODO]
 ///
-bool Parser::MaybeParseCXXScopeSpecifier(CXXScopeSpec &SS,
-                                         const Token *GlobalQualifier) {
+bool Parser::MaybeParseCXXScopeSpecifier(CXXScopeSpec &SS) {
   assert(getLang().CPlusPlus &&
          "Call sites of this function should be guarded by checking for C++");
 
   if (Tok.is(tok::annot_cxxscope)) {
-    assert(GlobalQualifier == 0 &&
-           "Cannot have :: followed by a resolved annotation scope");
     SS.setScopeRep(Tok.getAnnotationValue());
     SS.setRange(Tok.getAnnotationRange());
     ConsumeToken();
     return true;
   }
 
-  if (GlobalQualifier) {
-    // Pre-parsed '::'.
-    SS.setBeginLoc(GlobalQualifier->getLocation());
-    SS.setScopeRep(Actions.ActOnCXXGlobalScopeSpecifier(CurScope, 
-                                               GlobalQualifier->getLocation()));
-    SS.setEndLoc(GlobalQualifier->getLocation());
+  if (Tok.is(tok::coloncolon)) {
+    // ::new and ::delete aren't nested-name-specifiers.
+    tok::TokenKind NextKind = NextToken().getKind();
+    if (NextKind == tok::kw_new || NextKind == tok::kw_delete)
+      return false;
     
-    assert(Tok.isNot(tok::kw_new) && Tok.isNot(tok::kw_delete) &&
-           "Never called with preparsed :: qualifier and with new/delete");
-  } else if (Tok.is(tok::coloncolon)) {
     // '::' - Global scope qualifier.
     SourceLocation CCLoc = ConsumeToken();
-      
-    // ::new and ::delete aren't nested-name-specifiers, and 
-    // MaybeParseCXXScopeSpecifier is never called in a context where one
-    // could exist.  This means that if we see it, we have a syntax error.
-    if (Tok.is(tok::kw_new) || Tok.is(tok::kw_delete)) {
-      Diag(Tok, diag::err_invalid_qualified_new_delete)
-        << Tok.is(tok::kw_delete);
-      return false;
-    }
-    
     SS.setBeginLoc(CCLoc);
     SS.setScopeRep(Actions.ActOnCXXGlobalScopeSpecifier(CurScope, CCLoc));
     SS.setEndLoc(CCLoc);
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp
index 1cd0b022b5da..4984ebaff8aa 100644
--- a/clang/lib/Parse/Parser.cpp
+++ b/clang/lib/Parse/Parser.cpp
@@ -746,14 +746,14 @@ Parser::OwningExprResult Parser::ParseSimpleAsm() {
 /// 
 /// Note that this routine emits an error if you call it with ::new or ::delete
 /// as the current tokens, so only call it in contexts where these are invalid.
-bool Parser::TryAnnotateTypeOrScopeToken(const Token *GlobalQualifier) {
+bool Parser::TryAnnotateTypeOrScopeToken() {
   assert((Tok.is(tok::identifier) || Tok.is(tok::coloncolon)) &&
          "Cannot be a type or scope token!");
   
   // FIXME: Implement template-ids
   CXXScopeSpec SS;
   if (getLang().CPlusPlus)
-    MaybeParseCXXScopeSpecifier(SS, GlobalQualifier);
+    MaybeParseCXXScopeSpecifier(SS);
 
   if (Tok.is(tok::identifier)) {
     // Determine whether the identifier is a type name.