--- a/dom/base/Document.cpp
+++ b/dom/base/Document.cpp
@@ -1850,22 +1850,22 @@ Document::~Document() {
 
   mParentDocument = nullptr;
 
   // Kill the subdocument map, doing this will release its strong
   // references, if any.
   delete mSubDocuments;
   mSubDocuments = nullptr;
 
+  nsAutoScriptBlocker scriptBlocker;
+
   // Destroy link map now so we don't waste time removing
   // links one by one
   DestroyElementMaps();
 
-  nsAutoScriptBlocker scriptBlocker;
-
   // Invalidate cached array of child nodes
   InvalidateChildNodes();
 
   // We should not have child nodes when destructor is called,
   // since child nodes keep their owner document alive.
   MOZ_ASSERT(!HasChildren());
 
   mCachedRootElement = nullptr;
@@ -2374,25 +2374,25 @@ void Document::Reset(nsIChannel* aChanne
 
 void Document::DisconnectNodeTree() {
   // Delete references to sub-documents and kill the subdocument map,
   // if any. This is not strictly needed, but makes the node tree
   // teardown a bit faster.
   delete mSubDocuments;
   mSubDocuments = nullptr;
 
-  // Destroy link map now so we don't waste time removing
-  // links one by one
-  DestroyElementMaps();
-
   bool oldVal = mInUnlinkOrDeletion;
   mInUnlinkOrDeletion = true;
   {  // Scope for update
     MOZ_AUTO_DOC_UPDATE(this, true);
 
+    // Destroy link map now so we don't waste time removing
+    // links one by one
+    DestroyElementMaps();
+
     // Invalidate cached array of child nodes
     InvalidateChildNodes();
 
     while (HasChildren()) {
       nsCOMPtr<nsIContent> content = GetLastChild();
       nsIContent* previousSibling = content->GetPreviousSibling();
       DisconnectChild(content);
       if (content == mCachedRootElement) {
@@ -6360,17 +6360,19 @@ nsresult Document::InsertChildBefore(nsI
     NS_WARNING("Inserting root element when we already have one");
     return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
   }
 
   return nsINode::InsertChildBefore(aKid, aBeforeThis, aNotify);
 }
 
 void Document::RemoveChildNode(nsIContent* aKid, bool aNotify) {
+  Maybe<mozAutoDocUpdate> updateBatch;
   if (aKid->IsElement()) {
+    updateBatch.emplace(this, aNotify);
     // Destroy the link map up front before we mess with the child list.
     DestroyElementMaps();
   }
 
   // Preemptively clear mCachedRootElement, since we may be about to remove it
   // from our child list, and we don't want to return this maybe-obsolete value
   // from any GetRootElement() calls that happen inside of RemoveChildNode().
   // (NOTE: for this to be useful, RemoveChildNode() must NOT trigger any