diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 31e622c..c4e7eed 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -68,3 +68,7 @@ d42fda60d55d27bc61828901d09d15d2d536e5a7
 # Remove 'this->'
 f5cac93ac63559ddc0aec1b1c61c9e2503c7b8e0
 7ede03992a963d56754fc522f4c6f0bf944947cd
+# Revert PR1394
+57da88747e02c9d6bb66b7ff38b4db963fd388c9
+bb045907a043b5c6de9fb804ff11087333747329
+633f73e5a7743f1915a104c8bc27cf402754b7d7
diff --git a/libqpdf/CMakeLists.txt b/libqpdf/CMakeLists.txt
index af8034a..beccc93 100644
--- a/libqpdf/CMakeLists.txt
+++ b/libqpdf/CMakeLists.txt
@@ -54,7 +54,6 @@ set(libqpdf_SOURCES
   Pl_StdioFile.cc
   Pl_String.cc
   Pl_TIFFPredictor.cc
-  QPDF.cc
   QPDFAcroFormDocumentHelper.cc
   QPDFAnnotationObjectHelper.cc
   QPDFArgParser.cc
@@ -95,6 +94,7 @@ set(libqpdf_SOURCES
   QPDF_encryption.cc
   QPDF_json.cc
   QPDF_linearization.cc
+  QPDF_objects.cc
   QPDF_optimization.cc
   QPDF_pages.cc
   QTC.cc
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF_objects.cc
index 015c5e4..015c5e4 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF_objects.cc