diff --git a/clang/include/clang/AST/ASTContext.h b/clang/include/clang/AST/ASTContext.h
--- a/clang/include/clang/AST/ASTContext.h
+++ b/clang/include/clang/AST/ASTContext.h
@@ -561,7 +561,8 @@
   clang::PrintingPolicy PrintingPolicy;
   std::unique_ptr<interp::Context> InterpContext;
 
-  ast_type_traits::TraversalKind Traversal = ast_type_traits::TK_AsIs;
+  ast_type_traits::TraversalKind Traversal =
+      ast_type_traits::TK_IgnoreUnlessSpelledInSource;
 
 public:
   ast_type_traits::TraversalKind getTraversalKind() const { return Traversal; }