diff --git a/fpdfsdk/fpdf_dataavail.cpp b/fpdfsdk/fpdf_dataavail.cpp
index 05713ff..186cc4c 100644
--- a/fpdfsdk/fpdf_dataavail.cpp
+++ b/fpdfsdk/fpdf_dataavail.cpp
@@ -170,10 +170,6 @@
     return nullptr;
   }
 
-#ifdef PDF_ENABLE_XFA
-  document->SetExtension(std::make_unique<CPDFXFA_Context>(document.get()));
-#endif  // PDF_ENABLE_XFA
-
   ReportUnsupportedFeatures(document.get());
   return FPDFDocumentFromCPDFDocument(document.release());
 }
diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp
index a5a406a..8441c09 100644
--- a/fpdfsdk/fpdf_editpage.cpp
+++ b/fpdfsdk/fpdf_editpage.cpp
@@ -174,10 +174,6 @@
     pInfoDict->SetNewFor<CPDF_String>("Creator", L"PDFium");
   }
 
-#ifdef PDF_ENABLE_XFA
-  pDoc->SetExtension(std::make_unique<CPDFXFA_Context>(pDoc.get()));
-#endif  // PDF_ENABLE_XFA
-
   // Caller takes ownership of pDoc.
   return FPDFDocumentFromCPDFDocument(pDoc.release());
 }