diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 69767e0..fabfdc9 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -894,7 +894,7 @@
   if (getLangOpts().ModulesLocalVisibility)
     MergedDefModules[ND].push_back(M);
   else
-    ND->setHidden(false);
+    ND->setVisibleDespiteOwningModule();
 }
 
 void ASTContext::deduplicateMergedDefinitonsFor(NamedDecl *ND) {
diff --git a/clang/lib/AST/DeclBase.cpp b/clang/lib/AST/DeclBase.cpp
index 77ba6cf..a0594a0 100644
--- a/clang/lib/AST/DeclBase.cpp
+++ b/clang/lib/AST/DeclBase.cpp
@@ -278,12 +278,12 @@
   // FIXME: We shouldn't be changing the lexical context of declarations
   // imported from AST files.
   if (!isFromASTFile()) {
-    Hidden = cast<Decl>(DC)->Hidden && hasLocalOwningModuleStorage();
-    if (Hidden)
+    setModuleOwnershipKind(getModuleOwnershipKindForChildOf(DC));
+    if (hasOwningModule())
       setLocalOwningModule(cast<Decl>(DC)->getOwningModule());
   }
 
-  assert((!Hidden || getOwningModule()) &&
+  assert((!hasOwningModule() || getOwningModule()) &&
          "hidden declaration has no owning module");
 }