From 8e703c8c351d6b985c3d2ffa70f516c56f10ba86 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Tue, 24 May 2022 10:03:23 -0700
Subject: [PATCH] Provide a default "loadPage()" implementation on
 "CursorPagedPolicyAwareQuery"

Summary: Ref T13682. Many subclasses of "CursorPagedPolicyAwareQuery" have the same implementation of "loadPage()", and this is a sensible default behavior.

Test Plan: Examined changes to verify that all removed methods have the same behavior.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13682

Differential Revision: https://secure.phabricator.com/D21838
---
 .../almanac/query/AlmanacBindingQuery.php      |  4 ----
 .../almanac/query/AlmanacDeviceQuery.php       |  4 ----
 .../almanac/query/AlmanacInterfaceQuery.php    |  4 ----
 .../almanac/query/AlmanacNamespaceQuery.php    |  4 ----
 .../almanac/query/AlmanacNetworkQuery.php      |  4 ----
 .../almanac/query/AlmanacPropertyQuery.php     |  4 ----
 .../almanac/query/AlmanacServiceQuery.php      |  4 ----
 .../query/PhabricatorAuthChallengeQuery.php    |  4 ----
 .../PhabricatorAuthContactNumberQuery.php      |  4 ----
 .../query/PhabricatorAuthFactorConfigQuery.php |  4 ----
 .../PhabricatorAuthFactorProviderQuery.php     |  4 ----
 .../auth/query/PhabricatorAuthMessageQuery.php |  4 ----
 .../query/PhabricatorAuthPasswordQuery.php     |  4 ----
 .../PhabricatorAuthProviderConfigQuery.php     |  4 ----
 .../auth/query/PhabricatorAuthSSHKeyQuery.php  |  4 ----
 .../auth/query/PhabricatorAuthSessionQuery.php |  4 ----
 .../PhabricatorAuthTemporaryTokenQuery.php     |  4 ----
 ...abricatorExternalAccountIdentifierQuery.php |  4 ----
 .../query/PhabricatorExternalAccountQuery.php  |  4 ----
 .../query/PhabricatorBadgesAwardQuery.php      |  4 ----
 .../badges/query/PhabricatorBadgesQuery.php    |  4 ----
 .../query/PhabricatorCalendarExportQuery.php   |  4 ----
 ...PhabricatorCalendarExternalInviteeQuery.php |  4 ----
 .../PhabricatorCalendarImportLogQuery.php      |  4 ----
 .../query/PhabricatorCalendarImportQuery.php   |  4 ----
 .../query/PhabricatorConduitLogQuery.php       |  4 ----
 .../query/PhabricatorConduitTokenQuery.php     |  4 ----
 .../query/PhabricatorCountdownQuery.php        |  4 ----
 .../query/PhabricatorDashboardPanelQuery.php   |  4 ----
 .../query/PhabricatorDashboardPortalQuery.php  |  4 ----
 .../query/PhabricatorDashboardQuery.php        |  4 ----
 .../query/DifferentialChangesetQuery.php       |  4 ----
 .../query/DifferentialDiffQuery.php            |  4 ----
 .../query/DifferentialHunkQuery.php            |  4 ----
 .../query/DifferentialViewStateQuery.php       |  4 ----
 .../query/DiffusionCommitHintQuery.php         |  4 ----
 .../query/DoorkeeperExternalObjectQuery.php    |  4 ----
 .../query/DrydockAuthorizationQuery.php        |  4 ----
 .../drydock/query/DrydockBlueprintQuery.php    |  4 ----
 .../drydock/query/DrydockCommandQuery.php      |  4 ----
 .../drydock/query/DrydockLeaseQuery.php        |  4 ----
 .../drydock/query/DrydockLogQuery.php          |  4 ----
 .../query/DrydockRepositoryOperationQuery.php  |  4 ----
 .../drydock/query/DrydockResourceQuery.php     |  4 ----
 .../query/PhabricatorFileAttachmentQuery.php   |  4 ----
 .../fund/query/FundInitiativeQuery.php         |  4 ----
 .../query/HarbormasterBuildArtifactQuery.php   |  4 ----
 .../query/HarbormasterBuildLogQuery.php        |  4 ----
 .../query/HarbormasterBuildMessageQuery.php    |  4 ----
 .../query/HarbormasterBuildPlanQuery.php       |  4 ----
 .../query/HarbormasterBuildQuery.php           |  4 ----
 .../query/HarbormasterBuildStepQuery.php       |  4 ----
 .../query/HarbormasterBuildTargetQuery.php     |  4 ----
 .../HarbormasterBuildUnitMessageQuery.php      |  4 ----
 .../query/HarbormasterBuildableQuery.php       |  4 ----
 .../herald/query/HeraldRuleQuery.php           |  4 ----
 .../herald/query/HeraldWebhookQuery.php        |  4 ----
 .../herald/query/HeraldWebhookRequestQuery.php |  4 ----
 .../legalpad/query/LegalpadDocumentQuery.php   |  4 ----
 .../macro/query/PhabricatorMacroQuery.php      |  4 ----
 .../PhabricatorMetaMTAMailPropertiesQuery.php  |  4 ----
 .../query/PhabricatorMetaMTAMailQuery.php      |  4 ----
 .../query/NuanceImportCursorDataQuery.php      |  4 ----
 .../nuance/query/NuanceItemCommandQuery.php    |  4 ----
 .../nuance/query/NuanceItemQuery.php           |  4 ----
 .../nuance/query/NuanceQueueQuery.php          |  4 ----
 .../nuance/query/NuanceSourceQuery.php         |  4 ----
 ...habricatorOAuthClientAuthorizationQuery.php |  4 ----
 .../query/PhabricatorOwnersPackageQuery.php    |  4 ----
 .../query/PhabricatorPackagesPackageQuery.php  |  4 ----
 .../PhabricatorPackagesPublisherQuery.php      |  4 ----
 .../query/PhabricatorPackagesVersionQuery.php  |  4 ----
 .../query/PassphraseCredentialQuery.php        |  4 ----
 .../paste/query/PhabricatorPasteQuery.php      |  4 ----
 .../people/query/PhabricatorPeopleLogQuery.php |  4 ----
 .../people/query/PhabricatorPeopleQuery.php    |  4 ----
 .../query/PhabricatorPeopleUserEmailQuery.php  |  4 ----
 .../phame/query/PhameBlogQuery.php             |  4 ----
 .../phame/query/PhamePostQuery.php             |  4 ----
 .../pholio/query/PholioImageQuery.php          |  4 ----
 .../query/PhortuneAccountEmailQuery.php        |  4 ----
 .../phortune/query/PhortuneAccountQuery.php    |  4 ----
 .../phortune/query/PhortuneMerchantQuery.php   |  4 ----
 .../query/PhortunePaymentMethodQuery.php       |  4 ----
 .../query/PhortuneSubscriptionQuery.php        |  4 ----
 .../phriction/query/PhrictionContentQuery.php  |  4 ----
 .../phriction/query/PhrictionDocumentQuery.php |  4 ----
 .../phurl/query/PhabricatorPhurlURLQuery.php   |  4 ----
 .../ponder/query/PonderAnswerQuery.php         |  4 ----
 .../ponder/query/PonderQuestionQuery.php       |  4 ----
 .../PhabricatorProjectColumnPositionQuery.php  |  4 ----
 .../query/PhabricatorProjectColumnQuery.php    |  4 ----
 .../project/query/PhabricatorProjectQuery.php  |  4 ----
 .../query/PhabricatorProjectTriggerQuery.php   |  4 ----
 .../PhabricatorRepositoryGitLFSRefQuery.php    |  4 ----
 .../PhabricatorRepositoryIdentityQuery.php     |  4 ----
 .../PhabricatorRepositoryPullEventQuery.php    |  4 ----
 .../PhabricatorRepositoryPushEventQuery.php    |  4 ----
 .../PhabricatorRepositoryPushLogQuery.php      |  4 ----
 .../PhabricatorRepositoryRefCursorQuery.php    |  4 ----
 .../PhabricatorRepositorySyncEventQuery.php    |  4 ----
 .../query/PhabricatorRepositoryURIQuery.php    |  4 ----
 .../query/PhabricatorNamedQueryConfigQuery.php |  4 ----
 .../query/PhabricatorNamedQueryQuery.php       |  4 ----
 ...icatorProfileMenuItemConfigurationQuery.php |  4 ----
 .../query/PhabricatorSlowvoteQuery.php         |  4 ----
 .../query/PhabricatorSpacesNamespaceQuery.php  |  4 ++--
 .../query/PhabricatorTokenGivenQuery.php       |  4 ----
 ...catorApplicationTransactionCommentQuery.php |  4 ----
 .../query/PhabricatorXHProfSampleQuery.php     |  4 ----
 .../query/PhabricatorWorkerBulkJobQuery.php    |  4 ----
 .../PhabricatorCursorPagedPolicyAwareQuery.php | 18 ++++++++++++++++++
 112 files changed, 20 insertions(+), 442 deletions(-)

diff --git a/src/applications/almanac/query/AlmanacBindingQuery.php b/src/applications/almanac/query/AlmanacBindingQuery.php
index 574967f7bb..c3c7940525 100644
--- a/src/applications/almanac/query/AlmanacBindingQuery.php
+++ b/src/applications/almanac/query/AlmanacBindingQuery.php
@@ -44,10 +44,6 @@ final class AlmanacBindingQuery
     return new AlmanacBinding();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $bindings) {
     $service_phids = mpull($bindings, 'getServicePHID');
     $device_phids = mpull($bindings, 'getDevicePHID');
diff --git a/src/applications/almanac/query/AlmanacDeviceQuery.php b/src/applications/almanac/query/AlmanacDeviceQuery.php
index 7fcf219571..42796c4839 100644
--- a/src/applications/almanac/query/AlmanacDeviceQuery.php
+++ b/src/applications/almanac/query/AlmanacDeviceQuery.php
@@ -56,10 +56,6 @@ final class AlmanacDeviceQuery
     return new AlmanacDevice();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/almanac/query/AlmanacInterfaceQuery.php b/src/applications/almanac/query/AlmanacInterfaceQuery.php
index 5738108ffc..dbbc0cd53e 100644
--- a/src/applications/almanac/query/AlmanacInterfaceQuery.php
+++ b/src/applications/almanac/query/AlmanacInterfaceQuery.php
@@ -38,10 +38,6 @@ final class AlmanacInterfaceQuery
     return new AlmanacInterface();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $interfaces) {
     $network_phids = mpull($interfaces, 'getNetworkPHID');
     $device_phids = mpull($interfaces, 'getDevicePHID');
diff --git a/src/applications/almanac/query/AlmanacNamespaceQuery.php b/src/applications/almanac/query/AlmanacNamespaceQuery.php
index d4378e17c7..e6c99bf6ea 100644
--- a/src/applications/almanac/query/AlmanacNamespaceQuery.php
+++ b/src/applications/almanac/query/AlmanacNamespaceQuery.php
@@ -32,10 +32,6 @@ final class AlmanacNamespaceQuery
     return new AlmanacNamespace();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/almanac/query/AlmanacNetworkQuery.php b/src/applications/almanac/query/AlmanacNetworkQuery.php
index 13176f7de1..7af9db8585 100644
--- a/src/applications/almanac/query/AlmanacNetworkQuery.php
+++ b/src/applications/almanac/query/AlmanacNetworkQuery.php
@@ -32,10 +32,6 @@ final class AlmanacNetworkQuery
       $ngrams);
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/almanac/query/AlmanacPropertyQuery.php b/src/applications/almanac/query/AlmanacPropertyQuery.php
index 17f1e87c07..4261c70fec 100644
--- a/src/applications/almanac/query/AlmanacPropertyQuery.php
+++ b/src/applications/almanac/query/AlmanacPropertyQuery.php
@@ -33,10 +33,6 @@ final class AlmanacPropertyQuery
     return new AlmanacProperty();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $properties) {
     $object_phids = mpull($properties, 'getObjectPHID');
 
diff --git a/src/applications/almanac/query/AlmanacServiceQuery.php b/src/applications/almanac/query/AlmanacServiceQuery.php
index 4e374ec90c..eaca9d4a76 100644
--- a/src/applications/almanac/query/AlmanacServiceQuery.php
+++ b/src/applications/almanac/query/AlmanacServiceQuery.php
@@ -69,10 +69,6 @@ final class AlmanacServiceQuery
     return new AlmanacService();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildJoinClauseParts(AphrontDatabaseConnection $conn) {
     $joins = parent::buildJoinClauseParts($conn);
 
diff --git a/src/applications/auth/query/PhabricatorAuthChallengeQuery.php b/src/applications/auth/query/PhabricatorAuthChallengeQuery.php
index 195abe0884..c6abead11f 100644
--- a/src/applications/auth/query/PhabricatorAuthChallengeQuery.php
+++ b/src/applications/auth/query/PhabricatorAuthChallengeQuery.php
@@ -40,10 +40,6 @@ final class PhabricatorAuthChallengeQuery
     return new PhabricatorAuthChallenge();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/auth/query/PhabricatorAuthContactNumberQuery.php b/src/applications/auth/query/PhabricatorAuthContactNumberQuery.php
index 77b3b559dd..ba507c757b 100644
--- a/src/applications/auth/query/PhabricatorAuthContactNumberQuery.php
+++ b/src/applications/auth/query/PhabricatorAuthContactNumberQuery.php
@@ -44,10 +44,6 @@ final class PhabricatorAuthContactNumberQuery
     return new PhabricatorAuthContactNumber();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/auth/query/PhabricatorAuthFactorConfigQuery.php b/src/applications/auth/query/PhabricatorAuthFactorConfigQuery.php
index 5f838f66ba..dd73d0b081 100644
--- a/src/applications/auth/query/PhabricatorAuthFactorConfigQuery.php
+++ b/src/applications/auth/query/PhabricatorAuthFactorConfigQuery.php
@@ -38,10 +38,6 @@ final class PhabricatorAuthFactorConfigQuery
     return new PhabricatorAuthFactorConfig();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/auth/query/PhabricatorAuthFactorProviderQuery.php b/src/applications/auth/query/PhabricatorAuthFactorProviderQuery.php
index 57b554885c..7083545e3e 100644
--- a/src/applications/auth/query/PhabricatorAuthFactorProviderQuery.php
+++ b/src/applications/auth/query/PhabricatorAuthFactorProviderQuery.php
@@ -32,10 +32,6 @@ final class PhabricatorAuthFactorProviderQuery
     return new PhabricatorAuthFactorProvider();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/auth/query/PhabricatorAuthMessageQuery.php b/src/applications/auth/query/PhabricatorAuthMessageQuery.php
index 384c8de23b..7158d03a00 100644
--- a/src/applications/auth/query/PhabricatorAuthMessageQuery.php
+++ b/src/applications/auth/query/PhabricatorAuthMessageQuery.php
@@ -26,10 +26,6 @@ final class PhabricatorAuthMessageQuery
     return new PhabricatorAuthMessage();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/auth/query/PhabricatorAuthPasswordQuery.php b/src/applications/auth/query/PhabricatorAuthPasswordQuery.php
index 483936fb30..a77fd54b13 100644
--- a/src/applications/auth/query/PhabricatorAuthPasswordQuery.php
+++ b/src/applications/auth/query/PhabricatorAuthPasswordQuery.php
@@ -38,10 +38,6 @@ final class PhabricatorAuthPasswordQuery
     return new PhabricatorAuthPassword();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php b/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php
index ee073e3ac1..30e5dad113 100644
--- a/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php
+++ b/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php
@@ -32,10 +32,6 @@ final class PhabricatorAuthProviderConfigQuery
     return new PhabricatorAuthProviderConfig();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php b/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php
index 3a310ed173..7d4aac4a01 100644
--- a/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php
+++ b/src/applications/auth/query/PhabricatorAuthSSHKeyQuery.php
@@ -47,10 +47,6 @@ final class PhabricatorAuthSSHKeyQuery
     return new PhabricatorAuthSSHKey();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $keys) {
     $object_phids = mpull($keys, 'getObjectPHID');
 
diff --git a/src/applications/auth/query/PhabricatorAuthSessionQuery.php b/src/applications/auth/query/PhabricatorAuthSessionQuery.php
index 00a663e964..4bc7eba73f 100644
--- a/src/applications/auth/query/PhabricatorAuthSessionQuery.php
+++ b/src/applications/auth/query/PhabricatorAuthSessionQuery.php
@@ -38,10 +38,6 @@ final class PhabricatorAuthSessionQuery
     return new PhabricatorAuthSession();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $sessions) {
     $identity_phids = mpull($sessions, 'getUserPHID');
 
diff --git a/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php b/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php
index 72141f75f0..c5cb39096c 100644
--- a/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php
+++ b/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php
@@ -44,10 +44,6 @@ final class PhabricatorAuthTemporaryTokenQuery
     return new PhabricatorAuthTemporaryToken();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/auth/query/PhabricatorExternalAccountIdentifierQuery.php b/src/applications/auth/query/PhabricatorExternalAccountIdentifierQuery.php
index c44e0aed4f..b5c5b6eaa2 100644
--- a/src/applications/auth/query/PhabricatorExternalAccountIdentifierQuery.php
+++ b/src/applications/auth/query/PhabricatorExternalAccountIdentifierQuery.php
@@ -38,10 +38,6 @@ final class PhabricatorExternalAccountIdentifierQuery
     return new PhabricatorExternalAccountIdentifier();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/auth/query/PhabricatorExternalAccountQuery.php b/src/applications/auth/query/PhabricatorExternalAccountQuery.php
index bdc030f20c..f44821d7a9 100644
--- a/src/applications/auth/query/PhabricatorExternalAccountQuery.php
+++ b/src/applications/auth/query/PhabricatorExternalAccountQuery.php
@@ -66,10 +66,6 @@ final class PhabricatorExternalAccountQuery
     return new PhabricatorExternalAccount();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $accounts) {
     $viewer = $this->getViewer();
 
diff --git a/src/applications/badges/query/PhabricatorBadgesAwardQuery.php b/src/applications/badges/query/PhabricatorBadgesAwardQuery.php
index 347462de4d..57e53a5a30 100644
--- a/src/applications/badges/query/PhabricatorBadgesAwardQuery.php
+++ b/src/applications/badges/query/PhabricatorBadgesAwardQuery.php
@@ -57,10 +57,6 @@ final class PhabricatorBadgesAwardQuery
     return (bool)$this->badgeStatuses;
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   public function newResultObject() {
     return new PhabricatorBadgesAward();
   }
diff --git a/src/applications/badges/query/PhabricatorBadgesQuery.php b/src/applications/badges/query/PhabricatorBadgesQuery.php
index dcadf881fe..cc59465f67 100644
--- a/src/applications/badges/query/PhabricatorBadgesQuery.php
+++ b/src/applications/badges/query/PhabricatorBadgesQuery.php
@@ -34,10 +34,6 @@ final class PhabricatorBadgesQuery
       $ngrams);
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function getPrimaryTableAlias() {
     return 'badges';
   }
diff --git a/src/applications/calendar/query/PhabricatorCalendarExportQuery.php b/src/applications/calendar/query/PhabricatorCalendarExportQuery.php
index c51671c806..7ef970216f 100644
--- a/src/applications/calendar/query/PhabricatorCalendarExportQuery.php
+++ b/src/applications/calendar/query/PhabricatorCalendarExportQuery.php
@@ -38,10 +38,6 @@ final class PhabricatorCalendarExportQuery
     return new PhabricatorCalendarExport();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/calendar/query/PhabricatorCalendarExternalInviteeQuery.php b/src/applications/calendar/query/PhabricatorCalendarExternalInviteeQuery.php
index ea7200e614..35891cfd28 100644
--- a/src/applications/calendar/query/PhabricatorCalendarExternalInviteeQuery.php
+++ b/src/applications/calendar/query/PhabricatorCalendarExternalInviteeQuery.php
@@ -26,10 +26,6 @@ final class PhabricatorCalendarExternalInviteeQuery
     return new PhabricatorCalendarExternalInvitee();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/calendar/query/PhabricatorCalendarImportLogQuery.php b/src/applications/calendar/query/PhabricatorCalendarImportLogQuery.php
index 81f309bdca..731b1209cc 100644
--- a/src/applications/calendar/query/PhabricatorCalendarImportLogQuery.php
+++ b/src/applications/calendar/query/PhabricatorCalendarImportLogQuery.php
@@ -26,10 +26,6 @@ final class PhabricatorCalendarImportLogQuery
     return new PhabricatorCalendarImportLog();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/calendar/query/PhabricatorCalendarImportQuery.php b/src/applications/calendar/query/PhabricatorCalendarImportQuery.php
index 5d44657994..0e3dbbf387 100644
--- a/src/applications/calendar/query/PhabricatorCalendarImportQuery.php
+++ b/src/applications/calendar/query/PhabricatorCalendarImportQuery.php
@@ -32,10 +32,6 @@ final class PhabricatorCalendarImportQuery
     return new PhabricatorCalendarImport();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/conduit/query/PhabricatorConduitLogQuery.php b/src/applications/conduit/query/PhabricatorConduitLogQuery.php
index 23a5b46786..19cb31a812 100644
--- a/src/applications/conduit/query/PhabricatorConduitLogQuery.php
+++ b/src/applications/conduit/query/PhabricatorConduitLogQuery.php
@@ -40,10 +40,6 @@ final class PhabricatorConduitLogQuery
     return new PhabricatorConduitMethodCallLog();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/conduit/query/PhabricatorConduitTokenQuery.php b/src/applications/conduit/query/PhabricatorConduitTokenQuery.php
index ef35b006a7..384efccadf 100644
--- a/src/applications/conduit/query/PhabricatorConduitTokenQuery.php
+++ b/src/applications/conduit/query/PhabricatorConduitTokenQuery.php
@@ -38,10 +38,6 @@ final class PhabricatorConduitTokenQuery
     return new PhabricatorConduitToken();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/countdown/query/PhabricatorCountdownQuery.php b/src/applications/countdown/query/PhabricatorCountdownQuery.php
index 67a2f3a9e3..4a6df16e8e 100644
--- a/src/applications/countdown/query/PhabricatorCountdownQuery.php
+++ b/src/applications/countdown/query/PhabricatorCountdownQuery.php
@@ -28,10 +28,6 @@ final class PhabricatorCountdownQuery
     return $this;
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   public function newResultObject() {
     return new PhabricatorCountdown();
   }
diff --git a/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php b/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php
index dd32d1c9dc..c67b756262 100644
--- a/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php
+++ b/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php
@@ -34,10 +34,6 @@ final class PhabricatorDashboardPanelQuery
     return $this;
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   public function newResultObject() {
     // TODO: If we don't do this, SearchEngine explodes when trying to
     // enumerate custom fields. For now, just give the panel a default panel
diff --git a/src/applications/dashboard/query/PhabricatorDashboardPortalQuery.php b/src/applications/dashboard/query/PhabricatorDashboardPortalQuery.php
index 857c4dc215..418262c745 100644
--- a/src/applications/dashboard/query/PhabricatorDashboardPortalQuery.php
+++ b/src/applications/dashboard/query/PhabricatorDashboardPortalQuery.php
@@ -26,10 +26,6 @@ final class PhabricatorDashboardPortalQuery
     return new PhabricatorDashboardPortal();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/dashboard/query/PhabricatorDashboardQuery.php b/src/applications/dashboard/query/PhabricatorDashboardQuery.php
index 76854bffc1..954a565ac6 100644
--- a/src/applications/dashboard/query/PhabricatorDashboardQuery.php
+++ b/src/applications/dashboard/query/PhabricatorDashboardQuery.php
@@ -34,10 +34,6 @@ final class PhabricatorDashboardQuery
     return $this;
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   public function newResultObject() {
     return new PhabricatorDashboard();
   }
diff --git a/src/applications/differential/query/DifferentialChangesetQuery.php b/src/applications/differential/query/DifferentialChangesetQuery.php
index e2357f9278..ee29aa1cf8 100644
--- a/src/applications/differential/query/DifferentialChangesetQuery.php
+++ b/src/applications/differential/query/DifferentialChangesetQuery.php
@@ -58,10 +58,6 @@ final class DifferentialChangesetQuery
     return new DifferentialChangeset();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $changesets) {
     // First, attach all the diffs we already have. We can just do this
     // directly without worrying about querying for them. When we don't have
diff --git a/src/applications/differential/query/DifferentialDiffQuery.php b/src/applications/differential/query/DifferentialDiffQuery.php
index 3b1dd3ae62..04019df1e0 100644
--- a/src/applications/differential/query/DifferentialDiffQuery.php
+++ b/src/applications/differential/query/DifferentialDiffQuery.php
@@ -57,10 +57,6 @@ final class DifferentialDiffQuery
     return new DifferentialDiff();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $diffs) {
     $revision_ids = array_filter(mpull($diffs, 'getRevisionID'));
 
diff --git a/src/applications/differential/query/DifferentialHunkQuery.php b/src/applications/differential/query/DifferentialHunkQuery.php
index 981c2b4782..21787f04e5 100644
--- a/src/applications/differential/query/DifferentialHunkQuery.php
+++ b/src/applications/differential/query/DifferentialHunkQuery.php
@@ -34,10 +34,6 @@ final class DifferentialHunkQuery
     return new DifferentialHunk();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $hunks) {
     $changesets = mpull($this->changesets, null, 'getID');
     foreach ($hunks as $key => $hunk) {
diff --git a/src/applications/differential/query/DifferentialViewStateQuery.php b/src/applications/differential/query/DifferentialViewStateQuery.php
index 6ef63721e4..604a6de1db 100644
--- a/src/applications/differential/query/DifferentialViewStateQuery.php
+++ b/src/applications/differential/query/DifferentialViewStateQuery.php
@@ -26,10 +26,6 @@ final class DifferentialViewStateQuery
     return new DifferentialViewState();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/diffusion/query/DiffusionCommitHintQuery.php b/src/applications/diffusion/query/DiffusionCommitHintQuery.php
index bfd8045131..c0794a4387 100644
--- a/src/applications/diffusion/query/DiffusionCommitHintQuery.php
+++ b/src/applications/diffusion/query/DiffusionCommitHintQuery.php
@@ -56,10 +56,6 @@ final class DiffusionCommitHintQuery
     $this->commitMap = array();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php b/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php
index bc794cc629..2a33206831 100644
--- a/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php
+++ b/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php
@@ -20,10 +20,6 @@ final class DoorkeeperExternalObjectQuery
     return new DoorkeeperExternalObject();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/drydock/query/DrydockAuthorizationQuery.php b/src/applications/drydock/query/DrydockAuthorizationQuery.php
index d6436fc93a..8c5c58c853 100644
--- a/src/applications/drydock/query/DrydockAuthorizationQuery.php
+++ b/src/applications/drydock/query/DrydockAuthorizationQuery.php
@@ -72,10 +72,6 @@ final class DrydockAuthorizationQuery extends DrydockQuery {
     return new DrydockAuthorization();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $authorizations) {
     $blueprint_phids = mpull($authorizations, 'getBlueprintPHID');
     if ($blueprint_phids) {
diff --git a/src/applications/drydock/query/DrydockBlueprintQuery.php b/src/applications/drydock/query/DrydockBlueprintQuery.php
index a5df734e19..c163103d16 100644
--- a/src/applications/drydock/query/DrydockBlueprintQuery.php
+++ b/src/applications/drydock/query/DrydockBlueprintQuery.php
@@ -95,10 +95,6 @@ final class DrydockBlueprintQuery extends DrydockQuery {
     return 'blueprint';
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willExecute() {
     if ($this->identifiers) {
       $this->identifierMap = array();
diff --git a/src/applications/drydock/query/DrydockCommandQuery.php b/src/applications/drydock/query/DrydockCommandQuery.php
index 0d71288a85..fef6170ec9 100644
--- a/src/applications/drydock/query/DrydockCommandQuery.php
+++ b/src/applications/drydock/query/DrydockCommandQuery.php
@@ -25,10 +25,6 @@ final class DrydockCommandQuery extends DrydockQuery {
     return new DrydockCommand();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $commands) {
     $target_phids = mpull($commands, 'getTargetPHID');
 
diff --git a/src/applications/drydock/query/DrydockLeaseQuery.php b/src/applications/drydock/query/DrydockLeaseQuery.php
index 6bfb8deefe..4950764486 100644
--- a/src/applications/drydock/query/DrydockLeaseQuery.php
+++ b/src/applications/drydock/query/DrydockLeaseQuery.php
@@ -57,10 +57,6 @@ final class DrydockLeaseQuery extends DrydockQuery {
     return new DrydockLease();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $leases) {
     $resource_phids = array_filter(mpull($leases, 'getResourcePHID'));
     if ($resource_phids) {
diff --git a/src/applications/drydock/query/DrydockLogQuery.php b/src/applications/drydock/query/DrydockLogQuery.php
index 80f47f584f..d7e1f77ae6 100644
--- a/src/applications/drydock/query/DrydockLogQuery.php
+++ b/src/applications/drydock/query/DrydockLogQuery.php
@@ -37,10 +37,6 @@ final class DrydockLogQuery extends DrydockQuery {
     return new DrydockLog();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function didFilterPage(array $logs) {
     $blueprint_phids = array_filter(mpull($logs, 'getBlueprintPHID'));
     if ($blueprint_phids) {
diff --git a/src/applications/drydock/query/DrydockRepositoryOperationQuery.php b/src/applications/drydock/query/DrydockRepositoryOperationQuery.php
index a5fbe0acc9..6ef5d1b295 100644
--- a/src/applications/drydock/query/DrydockRepositoryOperationQuery.php
+++ b/src/applications/drydock/query/DrydockRepositoryOperationQuery.php
@@ -55,10 +55,6 @@ final class DrydockRepositoryOperationQuery extends DrydockQuery {
     return new DrydockRepositoryOperation();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $operations) {
     $implementations = DrydockRepositoryOperationType::getAllOperationTypes();
 
diff --git a/src/applications/drydock/query/DrydockResourceQuery.php b/src/applications/drydock/query/DrydockResourceQuery.php
index bcbff03663..395e758a23 100644
--- a/src/applications/drydock/query/DrydockResourceQuery.php
+++ b/src/applications/drydock/query/DrydockResourceQuery.php
@@ -49,10 +49,6 @@ final class DrydockResourceQuery extends DrydockQuery {
     return new DrydockResource();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $resources) {
     $blueprint_phids = mpull($resources, 'getBlueprintPHID');
 
diff --git a/src/applications/files/query/PhabricatorFileAttachmentQuery.php b/src/applications/files/query/PhabricatorFileAttachmentQuery.php
index 6367fc20f8..5fb37dc32e 100644
--- a/src/applications/files/query/PhabricatorFileAttachmentQuery.php
+++ b/src/applications/files/query/PhabricatorFileAttachmentQuery.php
@@ -32,10 +32,6 @@ final class PhabricatorFileAttachmentQuery
     return new PhabricatorFileAttachment();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/fund/query/FundInitiativeQuery.php b/src/applications/fund/query/FundInitiativeQuery.php
index bbb4ef2746..4b18597873 100644
--- a/src/applications/fund/query/FundInitiativeQuery.php
+++ b/src/applications/fund/query/FundInitiativeQuery.php
@@ -32,10 +32,6 @@ final class FundInitiativeQuery
     return new FundInitiative();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php b/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php
index de35c05aa6..59d4c07d2f 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php
@@ -40,10 +40,6 @@ final class HarbormasterBuildArtifactQuery
     return new HarbormasterBuildArtifact();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $page) {
     $build_targets = array();
 
diff --git a/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php b/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php
index ad27d09582..f62919f989 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php
@@ -27,10 +27,6 @@ final class HarbormasterBuildLogQuery
     return new HarbormasterBuildLog();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $page) {
     $build_targets = array();
 
diff --git a/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php b/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php
index 134c68ce04..393ca0a493 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php
@@ -26,10 +26,6 @@ final class HarbormasterBuildMessageQuery
     return new HarbormasterBuildMessage();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $page) {
     $receiver_phids = array_filter(mpull($page, 'getReceiverPHID'));
     if ($receiver_phids) {
diff --git a/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php b/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php
index 262aa12d7b..c8514b2186 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php
@@ -50,10 +50,6 @@ final class HarbormasterBuildPlanQuery
     return new HarbormasterBuildPlan();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function didFilterPage(array $page) {
     if ($this->needBuildSteps) {
       $plan_phids = mpull($page, 'getPHID');
diff --git a/src/applications/harbormaster/query/HarbormasterBuildQuery.php b/src/applications/harbormaster/query/HarbormasterBuildQuery.php
index 5ff5fe2eb3..a397f5968a 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildQuery.php
@@ -56,10 +56,6 @@ final class HarbormasterBuildQuery
     return new HarbormasterBuild();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $page) {
     $buildables = array();
 
diff --git a/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php b/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php
index 992dd4fad1..93010071e2 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php
@@ -26,10 +26,6 @@ final class HarbormasterBuildStepQuery
     return new HarbormasterBuildStep();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php b/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php
index 54b9c4ee16..a93aff60bd 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php
@@ -69,10 +69,6 @@ final class HarbormasterBuildTargetQuery
     return new HarbormasterBuildTarget();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/harbormaster/query/HarbormasterBuildUnitMessageQuery.php b/src/applications/harbormaster/query/HarbormasterBuildUnitMessageQuery.php
index f73016a29f..edfe102ca2 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildUnitMessageQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildUnitMessageQuery.php
@@ -26,10 +26,6 @@ final class HarbormasterBuildUnitMessageQuery
     return new HarbormasterBuildUnitMessage();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/harbormaster/query/HarbormasterBuildableQuery.php b/src/applications/harbormaster/query/HarbormasterBuildableQuery.php
index b1a643cac7..cf907a2dc3 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildableQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildableQuery.php
@@ -63,10 +63,6 @@ final class HarbormasterBuildableQuery
     return new HarbormasterBuildable();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $page) {
     $buildables = array();
 
diff --git a/src/applications/herald/query/HeraldRuleQuery.php b/src/applications/herald/query/HeraldRuleQuery.php
index e346a998d4..e104c44122 100644
--- a/src/applications/herald/query/HeraldRuleQuery.php
+++ b/src/applications/herald/query/HeraldRuleQuery.php
@@ -86,10 +86,6 @@ final class HeraldRuleQuery extends PhabricatorCursorPagedPolicyAwareQuery {
     return new HeraldRule();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $rules) {
     $rule_ids = mpull($rules, 'getID');
 
diff --git a/src/applications/herald/query/HeraldWebhookQuery.php b/src/applications/herald/query/HeraldWebhookQuery.php
index ca46880613..77307a71e6 100644
--- a/src/applications/herald/query/HeraldWebhookQuery.php
+++ b/src/applications/herald/query/HeraldWebhookQuery.php
@@ -26,10 +26,6 @@ final class HeraldWebhookQuery
     return new HeraldWebhook();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/herald/query/HeraldWebhookRequestQuery.php b/src/applications/herald/query/HeraldWebhookRequestQuery.php
index 4c71d48e05..f0a61a2dc5 100644
--- a/src/applications/herald/query/HeraldWebhookRequestQuery.php
+++ b/src/applications/herald/query/HeraldWebhookRequestQuery.php
@@ -29,10 +29,6 @@ final class HeraldWebhookRequestQuery
     return new HeraldWebhookRequest();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   public function withLastRequestEpochBetween($epoch_min, $epoch_max) {
     $this->lastRequestEpochMin = $epoch_min;
     $this->lastRequestEpochMax = $epoch_max;
diff --git a/src/applications/legalpad/query/LegalpadDocumentQuery.php b/src/applications/legalpad/query/LegalpadDocumentQuery.php
index 3d79e9f3a1..854a187fab 100644
--- a/src/applications/legalpad/query/LegalpadDocumentQuery.php
+++ b/src/applications/legalpad/query/LegalpadDocumentQuery.php
@@ -81,10 +81,6 @@ final class LegalpadDocumentQuery
     return new LegalpadDocument();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $documents) {
     if ($this->needDocumentBodies) {
       $documents = $this->loadDocumentBodies($documents);
diff --git a/src/applications/macro/query/PhabricatorMacroQuery.php b/src/applications/macro/query/PhabricatorMacroQuery.php
index 7261803888..70e7f7e688 100644
--- a/src/applications/macro/query/PhabricatorMacroQuery.php
+++ b/src/applications/macro/query/PhabricatorMacroQuery.php
@@ -100,10 +100,6 @@ final class PhabricatorMacroQuery
     return new PhabricatorFileImageMacro();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage(new PhabricatorFileImageMacro());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/metamta/query/PhabricatorMetaMTAMailPropertiesQuery.php b/src/applications/metamta/query/PhabricatorMetaMTAMailPropertiesQuery.php
index e6ec09f4ff..b7dd3e5ee4 100644
--- a/src/applications/metamta/query/PhabricatorMetaMTAMailPropertiesQuery.php
+++ b/src/applications/metamta/query/PhabricatorMetaMTAMailPropertiesQuery.php
@@ -20,10 +20,6 @@ final class PhabricatorMetaMTAMailPropertiesQuery
     return new PhabricatorMetaMTAMailProperties();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/metamta/query/PhabricatorMetaMTAMailQuery.php b/src/applications/metamta/query/PhabricatorMetaMTAMailQuery.php
index 903b385ceb..d1f0235c90 100644
--- a/src/applications/metamta/query/PhabricatorMetaMTAMailQuery.php
+++ b/src/applications/metamta/query/PhabricatorMetaMTAMailQuery.php
@@ -36,10 +36,6 @@ final class PhabricatorMetaMTAMailQuery
     return $this;
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/nuance/query/NuanceImportCursorDataQuery.php b/src/applications/nuance/query/NuanceImportCursorDataQuery.php
index ae451abfb9..133c940b3f 100644
--- a/src/applications/nuance/query/NuanceImportCursorDataQuery.php
+++ b/src/applications/nuance/query/NuanceImportCursorDataQuery.php
@@ -26,10 +26,6 @@ final class NuanceImportCursorDataQuery
     return new NuanceImportCursorData();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/nuance/query/NuanceItemCommandQuery.php b/src/applications/nuance/query/NuanceItemCommandQuery.php
index 27137cf8f6..a694657120 100644
--- a/src/applications/nuance/query/NuanceItemCommandQuery.php
+++ b/src/applications/nuance/query/NuanceItemCommandQuery.php
@@ -26,10 +26,6 @@ final class NuanceItemCommandQuery
     return new NuanceItemCommand();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/nuance/query/NuanceItemQuery.php b/src/applications/nuance/query/NuanceItemQuery.php
index 834e81ca72..e2e32c84b4 100644
--- a/src/applications/nuance/query/NuanceItemQuery.php
+++ b/src/applications/nuance/query/NuanceItemQuery.php
@@ -56,10 +56,6 @@ final class NuanceItemQuery
     return new NuanceItem();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $items) {
     $viewer = $this->getViewer();
     $source_phids = mpull($items, 'getSourcePHID');
diff --git a/src/applications/nuance/query/NuanceQueueQuery.php b/src/applications/nuance/query/NuanceQueueQuery.php
index 10f761d189..acb69665e0 100644
--- a/src/applications/nuance/query/NuanceQueueQuery.php
+++ b/src/applications/nuance/query/NuanceQueueQuery.php
@@ -20,10 +20,6 @@ final class NuanceQueueQuery
     return new NuanceQueue();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/nuance/query/NuanceSourceQuery.php b/src/applications/nuance/query/NuanceSourceQuery.php
index 907d9c314f..9186d47cdd 100644
--- a/src/applications/nuance/query/NuanceSourceQuery.php
+++ b/src/applications/nuance/query/NuanceSourceQuery.php
@@ -48,10 +48,6 @@ final class NuanceSourceQuery
     return 'source';
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $sources) {
     $all_types = NuanceSourceDefinition::getAllDefinitions();
 
diff --git a/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php b/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php
index a746008f55..63a62e8cd9 100644
--- a/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php
+++ b/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php
@@ -26,10 +26,6 @@ final class PhabricatorOAuthClientAuthorizationQuery
     return new PhabricatorOAuthClientAuthorization();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $authorizations) {
     $client_phids = mpull($authorizations, 'getClientPHID');
 
diff --git a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
index 9e5e4c3234..a80b972548 100644
--- a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
+++ b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
@@ -102,10 +102,6 @@ final class PhabricatorOwnersPackageQuery
     $this->controlResults = array();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $packages) {
     $package_ids = mpull($packages, 'getID');
 
diff --git a/src/applications/packages/query/PhabricatorPackagesPackageQuery.php b/src/applications/packages/query/PhabricatorPackagesPackageQuery.php
index 67cd3954c9..c97e3b244c 100644
--- a/src/applications/packages/query/PhabricatorPackagesPackageQuery.php
+++ b/src/applications/packages/query/PhabricatorPackagesPackageQuery.php
@@ -44,10 +44,6 @@ final class PhabricatorPackagesPackageQuery
     return new PhabricatorPackagesPackage();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/packages/query/PhabricatorPackagesPublisherQuery.php b/src/applications/packages/query/PhabricatorPackagesPublisherQuery.php
index d46535c20d..7d31e5fec6 100644
--- a/src/applications/packages/query/PhabricatorPackagesPublisherQuery.php
+++ b/src/applications/packages/query/PhabricatorPackagesPublisherQuery.php
@@ -32,10 +32,6 @@ final class PhabricatorPackagesPublisherQuery
     return new PhabricatorPackagesPublisher();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/packages/query/PhabricatorPackagesVersionQuery.php b/src/applications/packages/query/PhabricatorPackagesVersionQuery.php
index 6f417e2f77..447907c4a0 100644
--- a/src/applications/packages/query/PhabricatorPackagesVersionQuery.php
+++ b/src/applications/packages/query/PhabricatorPackagesVersionQuery.php
@@ -44,10 +44,6 @@ final class PhabricatorPackagesVersionQuery
     return new PhabricatorPackagesVersion();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/passphrase/query/PassphraseCredentialQuery.php b/src/applications/passphrase/query/PassphraseCredentialQuery.php
index 24f5f7440c..98ae9429a8 100644
--- a/src/applications/passphrase/query/PassphraseCredentialQuery.php
+++ b/src/applications/passphrase/query/PassphraseCredentialQuery.php
@@ -57,10 +57,6 @@ final class PassphraseCredentialQuery
     return new PassphraseCredential();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $page) {
     if ($this->needSecrets) {
       $secret_ids = mpull($page, 'getSecretID');
diff --git a/src/applications/paste/query/PhabricatorPasteQuery.php b/src/applications/paste/query/PhabricatorPasteQuery.php
index d90ef3b1d2..e841bff300 100644
--- a/src/applications/paste/query/PhabricatorPasteQuery.php
+++ b/src/applications/paste/query/PhabricatorPasteQuery.php
@@ -84,10 +84,6 @@ final class PhabricatorPasteQuery
     return new PhabricatorPaste();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage(new PhabricatorPaste());
-  }
-
   protected function didFilterPage(array $pastes) {
     if ($this->needRawContent) {
       $pastes = $this->loadRawContent($pastes);
diff --git a/src/applications/people/query/PhabricatorPeopleLogQuery.php b/src/applications/people/query/PhabricatorPeopleLogQuery.php
index 203f79579a..e87fb33660 100644
--- a/src/applications/people/query/PhabricatorPeopleLogQuery.php
+++ b/src/applications/people/query/PhabricatorPeopleLogQuery.php
@@ -58,10 +58,6 @@ final class PhabricatorPeopleLogQuery
     return new PhabricatorUserLog();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/people/query/PhabricatorPeopleQuery.php b/src/applications/people/query/PhabricatorPeopleQuery.php
index e122be0b2e..b74b936ba8 100644
--- a/src/applications/people/query/PhabricatorPeopleQuery.php
+++ b/src/applications/people/query/PhabricatorPeopleQuery.php
@@ -162,10 +162,6 @@ final class PhabricatorPeopleQuery
     return new PhabricatorUser();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function didFilterPage(array $users) {
     if ($this->needProfile) {
       $user_list = mpull($users, null, 'getPHID');
diff --git a/src/applications/people/query/PhabricatorPeopleUserEmailQuery.php b/src/applications/people/query/PhabricatorPeopleUserEmailQuery.php
index 6e2627a96d..ead44a56dc 100644
--- a/src/applications/people/query/PhabricatorPeopleUserEmailQuery.php
+++ b/src/applications/people/query/PhabricatorPeopleUserEmailQuery.php
@@ -20,10 +20,6 @@ final class PhabricatorPeopleUserEmailQuery
     return new PhabricatorUserEmail();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function getPrimaryTableAlias() {
     return 'email';
   }
diff --git a/src/applications/phame/query/PhameBlogQuery.php b/src/applications/phame/query/PhameBlogQuery.php
index b4018c78eb..b730f3c4aa 100644
--- a/src/applications/phame/query/PhameBlogQuery.php
+++ b/src/applications/phame/query/PhameBlogQuery.php
@@ -45,10 +45,6 @@ final class PhameBlogQuery extends PhabricatorCursorPagedPolicyAwareQuery {
     return new PhameBlog();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/phame/query/PhamePostQuery.php b/src/applications/phame/query/PhamePostQuery.php
index d7396e553f..61ee4f2a25 100644
--- a/src/applications/phame/query/PhamePostQuery.php
+++ b/src/applications/phame/query/PhamePostQuery.php
@@ -50,10 +50,6 @@ final class PhamePostQuery extends PhabricatorCursorPagedPolicyAwareQuery {
     return new PhamePost();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $posts) {
     // We require blogs to do visibility checks, so load them unconditionally.
     $blog_phids = mpull($posts, 'getBlogPHID');
diff --git a/src/applications/pholio/query/PholioImageQuery.php b/src/applications/pholio/query/PholioImageQuery.php
index 0d64540f91..69d890ab98 100644
--- a/src/applications/pholio/query/PholioImageQuery.php
+++ b/src/applications/pholio/query/PholioImageQuery.php
@@ -44,10 +44,6 @@ final class PholioImageQuery
     return new PholioImage();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/phortune/query/PhortuneAccountEmailQuery.php b/src/applications/phortune/query/PhortuneAccountEmailQuery.php
index 0bdfdb78dc..0e0a668b8c 100644
--- a/src/applications/phortune/query/PhortuneAccountEmailQuery.php
+++ b/src/applications/phortune/query/PhortuneAccountEmailQuery.php
@@ -38,10 +38,6 @@ final class PhortuneAccountEmailQuery
     return new PhortuneAccountEmail();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $addresses) {
     $accounts = id(new PhortuneAccountQuery())
       ->setViewer($this->getViewer())
diff --git a/src/applications/phortune/query/PhortuneAccountQuery.php b/src/applications/phortune/query/PhortuneAccountQuery.php
index 70c12d9722..43c7c5f976 100644
--- a/src/applications/phortune/query/PhortuneAccountQuery.php
+++ b/src/applications/phortune/query/PhortuneAccountQuery.php
@@ -46,10 +46,6 @@ final class PhortuneAccountQuery
     return new PhortuneAccount();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $accounts) {
     $query = id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs(mpull($accounts, 'getPHID'))
diff --git a/src/applications/phortune/query/PhortuneMerchantQuery.php b/src/applications/phortune/query/PhortuneMerchantQuery.php
index aef7d8aaf1..2c9aefc74d 100644
--- a/src/applications/phortune/query/PhortuneMerchantQuery.php
+++ b/src/applications/phortune/query/PhortuneMerchantQuery.php
@@ -32,10 +32,6 @@ final class PhortuneMerchantQuery
     return new PhortuneMerchant();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $merchants) {
     $query = id(new PhabricatorEdgeQuery())
       ->withSourcePHIDs(mpull($merchants, 'getPHID'))
diff --git a/src/applications/phortune/query/PhortunePaymentMethodQuery.php b/src/applications/phortune/query/PhortunePaymentMethodQuery.php
index 013fa147ec..b95881d3a7 100644
--- a/src/applications/phortune/query/PhortunePaymentMethodQuery.php
+++ b/src/applications/phortune/query/PhortunePaymentMethodQuery.php
@@ -38,10 +38,6 @@ final class PhortunePaymentMethodQuery
     return new PhortunePaymentMethod();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $methods) {
     $accounts = id(new PhortuneAccountQuery())
       ->setViewer($this->getViewer())
diff --git a/src/applications/phortune/query/PhortuneSubscriptionQuery.php b/src/applications/phortune/query/PhortuneSubscriptionQuery.php
index de0fee1980..5622578738 100644
--- a/src/applications/phortune/query/PhortuneSubscriptionQuery.php
+++ b/src/applications/phortune/query/PhortuneSubscriptionQuery.php
@@ -51,10 +51,6 @@ final class PhortuneSubscriptionQuery
     return new PhortuneSubscription();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $subscriptions) {
     $accounts = id(new PhortuneAccountQuery())
       ->setViewer($this->getViewer())
diff --git a/src/applications/phriction/query/PhrictionContentQuery.php b/src/applications/phriction/query/PhrictionContentQuery.php
index 6efab5e1c6..8ac92be351 100644
--- a/src/applications/phriction/query/PhrictionContentQuery.php
+++ b/src/applications/phriction/query/PhrictionContentQuery.php
@@ -32,10 +32,6 @@ final class PhrictionContentQuery
     return new PhrictionContent();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/phriction/query/PhrictionDocumentQuery.php b/src/applications/phriction/query/PhrictionDocumentQuery.php
index e7b5a0529e..298db97dbb 100644
--- a/src/applications/phriction/query/PhrictionDocumentQuery.php
+++ b/src/applications/phriction/query/PhrictionDocumentQuery.php
@@ -62,10 +62,6 @@ final class PhrictionDocumentQuery
     return $this;
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   public function newResultObject() {
     return new PhrictionDocument();
   }
diff --git a/src/applications/phurl/query/PhabricatorPhurlURLQuery.php b/src/applications/phurl/query/PhabricatorPhurlURLQuery.php
index 6efbbd5b4c..c30cedf09d 100644
--- a/src/applications/phurl/query/PhabricatorPhurlURLQuery.php
+++ b/src/applications/phurl/query/PhabricatorPhurlURLQuery.php
@@ -50,10 +50,6 @@ final class PhabricatorPhurlURLQuery
     return $this;
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/ponder/query/PonderAnswerQuery.php b/src/applications/ponder/query/PonderAnswerQuery.php
index 2901f4d6a5..f100f05ae3 100644
--- a/src/applications/ponder/query/PonderAnswerQuery.php
+++ b/src/applications/ponder/query/PonderAnswerQuery.php
@@ -59,10 +59,6 @@ final class PonderAnswerQuery
     return new PonderAnswer();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage(new PonderAnswer());
-  }
-
   protected function willFilterPage(array $answers) {
     $questions = id(new PonderQuestionQuery())
       ->setViewer($this->getViewer())
diff --git a/src/applications/ponder/query/PonderQuestionQuery.php b/src/applications/ponder/query/PonderQuestionQuery.php
index b2de14e52c..323f34aac5 100644
--- a/src/applications/ponder/query/PonderQuestionQuery.php
+++ b/src/applications/ponder/query/PonderQuestionQuery.php
@@ -86,10 +86,6 @@ final class PonderQuestionQuery
     return new PonderQuestion();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage(new PonderQuestion());
-  }
-
   protected function willFilterPage(array $questions) {
 
     $phids = mpull($questions, 'getPHID');
diff --git a/src/applications/project/query/PhabricatorProjectColumnPositionQuery.php b/src/applications/project/query/PhabricatorProjectColumnPositionQuery.php
index 438c558e6e..2673902780 100644
--- a/src/applications/project/query/PhabricatorProjectColumnPositionQuery.php
+++ b/src/applications/project/query/PhabricatorProjectColumnPositionQuery.php
@@ -32,10 +32,6 @@ final class PhabricatorProjectColumnPositionQuery
     return new PhabricatorProjectColumnPosition();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = array();
 
diff --git a/src/applications/project/query/PhabricatorProjectColumnQuery.php b/src/applications/project/query/PhabricatorProjectColumnQuery.php
index 380dab5208..478d872cb4 100644
--- a/src/applications/project/query/PhabricatorProjectColumnQuery.php
+++ b/src/applications/project/query/PhabricatorProjectColumnQuery.php
@@ -56,10 +56,6 @@ final class PhabricatorProjectColumnQuery
     return new PhabricatorProjectColumn();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $page) {
     $projects = array();
 
diff --git a/src/applications/project/query/PhabricatorProjectQuery.php b/src/applications/project/query/PhabricatorProjectQuery.php
index 22e0b59c94..b02fa647a2 100644
--- a/src/applications/project/query/PhabricatorProjectQuery.php
+++ b/src/applications/project/query/PhabricatorProjectQuery.php
@@ -236,10 +236,6 @@ final class PhabricatorProjectQuery
     }
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $projects) {
     $ancestor_paths = array();
     foreach ($projects as $project) {
diff --git a/src/applications/project/query/PhabricatorProjectTriggerQuery.php b/src/applications/project/query/PhabricatorProjectTriggerQuery.php
index 452e3e53f1..306fcb50fe 100644
--- a/src/applications/project/query/PhabricatorProjectTriggerQuery.php
+++ b/src/applications/project/query/PhabricatorProjectTriggerQuery.php
@@ -35,10 +35,6 @@ final class PhabricatorProjectTriggerQuery
     return new PhabricatorProjectTrigger();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/repository/query/PhabricatorRepositoryGitLFSRefQuery.php b/src/applications/repository/query/PhabricatorRepositoryGitLFSRefQuery.php
index cd693be605..08f0ada159 100644
--- a/src/applications/repository/query/PhabricatorRepositoryGitLFSRefQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryGitLFSRefQuery.php
@@ -26,10 +26,6 @@ final class PhabricatorRepositoryGitLFSRefQuery
     return new PhabricatorRepositoryGitLFSRef();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/repository/query/PhabricatorRepositoryIdentityQuery.php b/src/applications/repository/query/PhabricatorRepositoryIdentityQuery.php
index 7de97de4d6..2b05b542d5 100644
--- a/src/applications/repository/query/PhabricatorRepositoryIdentityQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryIdentityQuery.php
@@ -66,10 +66,6 @@ final class PhabricatorRepositoryIdentityQuery
      return 'identity';
    }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php b/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php
index ce14a6f831..8d4f14e0ce 100644
--- a/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPullEventQuery.php
@@ -40,10 +40,6 @@ final class PhabricatorRepositoryPullEventQuery
     return new PhabricatorRepositoryPullEvent();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $events) {
     // If a pull targets an invalid repository or fails before authenticating,
     // it may not have an associated repository.
diff --git a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php b/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php
index f3e5fc62b4..d1ce937b86 100644
--- a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php
@@ -38,10 +38,6 @@ final class PhabricatorRepositoryPushEventQuery
     return new PhabricatorRepositoryPushEvent();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $events) {
     $repository_phids = mpull($events, 'getRepositoryPHID');
     $repositories = id(new PhabricatorRepositoryQuery())
diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php
index d4734f61e6..16897a1e4b 100644
--- a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php
@@ -64,10 +64,6 @@ final class PhabricatorRepositoryPushLogQuery
     return new PhabricatorRepositoryPushLog();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $logs) {
     $event_phids = mpull($logs, 'getPushEventPHID');
     $events = id(new PhabricatorObjectQuery())
diff --git a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php
index b3c960e025..5e894333f6 100644
--- a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php
@@ -50,10 +50,6 @@ final class PhabricatorRepositoryRefCursorQuery
     return new PhabricatorRepositoryRefCursor();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $refs) {
     $repository_phids = mpull($refs, 'getRepositoryPHID');
 
diff --git a/src/applications/repository/query/PhabricatorRepositorySyncEventQuery.php b/src/applications/repository/query/PhabricatorRepositorySyncEventQuery.php
index 542cb5cdc0..cc568ef8e1 100644
--- a/src/applications/repository/query/PhabricatorRepositorySyncEventQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositorySyncEventQuery.php
@@ -34,10 +34,6 @@ final class PhabricatorRepositorySyncEventQuery
     return new PhabricatorRepositorySyncEvent();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $events) {
     $repository_phids = mpull($events, 'getRepositoryPHID');
     $repository_phids = array_filter($repository_phids);
diff --git a/src/applications/repository/query/PhabricatorRepositoryURIQuery.php b/src/applications/repository/query/PhabricatorRepositoryURIQuery.php
index 71252a6fb7..5b75e1ef63 100644
--- a/src/applications/repository/query/PhabricatorRepositoryURIQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryURIQuery.php
@@ -34,10 +34,6 @@ final class PhabricatorRepositoryURIQuery
     return new PhabricatorRepositoryURI();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/search/query/PhabricatorNamedQueryConfigQuery.php b/src/applications/search/query/PhabricatorNamedQueryConfigQuery.php
index 6c4fad31a3..862f694fc8 100644
--- a/src/applications/search/query/PhabricatorNamedQueryConfigQuery.php
+++ b/src/applications/search/query/PhabricatorNamedQueryConfigQuery.php
@@ -26,10 +26,6 @@ final class PhabricatorNamedQueryConfigQuery
     return new PhabricatorNamedQueryConfig();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/search/query/PhabricatorNamedQueryQuery.php b/src/applications/search/query/PhabricatorNamedQueryQuery.php
index 3decff5494..0ed92646e6 100644
--- a/src/applications/search/query/PhabricatorNamedQueryQuery.php
+++ b/src/applications/search/query/PhabricatorNamedQueryQuery.php
@@ -32,10 +32,6 @@ final class PhabricatorNamedQueryQuery
     return new PhabricatorNamedQuery();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/search/query/PhabricatorProfileMenuItemConfigurationQuery.php b/src/applications/search/query/PhabricatorProfileMenuItemConfigurationQuery.php
index 16b5d793a4..9f26a81424 100644
--- a/src/applications/search/query/PhabricatorProfileMenuItemConfigurationQuery.php
+++ b/src/applications/search/query/PhabricatorProfileMenuItemConfigurationQuery.php
@@ -40,10 +40,6 @@ final class PhabricatorProfileMenuItemConfigurationQuery
     return new PhabricatorProfileMenuItemConfiguration();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php b/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php
index 0b7335326c..72368a654a 100644
--- a/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php
+++ b/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php
@@ -57,10 +57,6 @@ final class PhabricatorSlowvoteQuery
     return new PhabricatorSlowvotePoll();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $polls) {
     assert_instances_of($polls, 'PhabricatorSlowvotePoll');
 
diff --git a/src/applications/spaces/query/PhabricatorSpacesNamespaceQuery.php b/src/applications/spaces/query/PhabricatorSpacesNamespaceQuery.php
index ee11dcdd06..388b6ab4d8 100644
--- a/src/applications/spaces/query/PhabricatorSpacesNamespaceQuery.php
+++ b/src/applications/spaces/query/PhabricatorSpacesNamespaceQuery.php
@@ -36,8 +36,8 @@ final class PhabricatorSpacesNamespaceQuery
     return 'PhabricatorSpacesApplication';
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage(new PhabricatorSpacesNamespace());
+  public function newResultObject() {
+    return new PhabricatorSpacesNamespace();
   }
 
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
diff --git a/src/applications/tokens/query/PhabricatorTokenGivenQuery.php b/src/applications/tokens/query/PhabricatorTokenGivenQuery.php
index b4a86428c1..0e6ad9eb54 100644
--- a/src/applications/tokens/query/PhabricatorTokenGivenQuery.php
+++ b/src/applications/tokens/query/PhabricatorTokenGivenQuery.php
@@ -26,10 +26,6 @@ final class PhabricatorTokenGivenQuery
     return new PhabricatorTokenGiven();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/applications/transactions/query/PhabricatorApplicationTransactionCommentQuery.php b/src/applications/transactions/query/PhabricatorApplicationTransactionCommentQuery.php
index 4f6f45bea7..eb4d4d8174 100644
--- a/src/applications/transactions/query/PhabricatorApplicationTransactionCommentQuery.php
+++ b/src/applications/transactions/query/PhabricatorApplicationTransactionCommentQuery.php
@@ -46,10 +46,6 @@ abstract class PhabricatorApplicationTransactionCommentQuery
     return $this->newApplicationTransactionCommentTemplate();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
     $alias = $this->getPrimaryTableAlias();
diff --git a/src/applications/xhprof/query/PhabricatorXHProfSampleQuery.php b/src/applications/xhprof/query/PhabricatorXHProfSampleQuery.php
index 3e9643a7fc..2001fec0c7 100644
--- a/src/applications/xhprof/query/PhabricatorXHProfSampleQuery.php
+++ b/src/applications/xhprof/query/PhabricatorXHProfSampleQuery.php
@@ -20,10 +20,6 @@ final class PhabricatorXHProfSampleQuery
     return new PhabricatorXHProfSample();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
     $where = parent::buildWhereClauseParts($conn);
 
diff --git a/src/infrastructure/daemon/workers/query/PhabricatorWorkerBulkJobQuery.php b/src/infrastructure/daemon/workers/query/PhabricatorWorkerBulkJobQuery.php
index 32a9419a33..b359157e06 100644
--- a/src/infrastructure/daemon/workers/query/PhabricatorWorkerBulkJobQuery.php
+++ b/src/infrastructure/daemon/workers/query/PhabricatorWorkerBulkJobQuery.php
@@ -38,10 +38,6 @@ final class PhabricatorWorkerBulkJobQuery
     return new PhabricatorWorkerBulkJob();
   }
 
-  protected function loadPage() {
-    return $this->loadStandardPage($this->newResultObject());
-  }
-
   protected function willFilterPage(array $page) {
     $map = PhabricatorWorkerBulkJobType::getAllJobTypes();
 
diff --git a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
index 80791400e0..42ccad3316 100644
--- a/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
+++ b/src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
@@ -265,6 +265,24 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery
     return $this->ferretMetadata;
   }
 
+  protected function loadPage() {
+    $object = $this->newResultObject();
+
+    if (!$object instanceof PhabricatorLiskDAO) {
+      throw new Exception(
+        pht(
+          'Query class ("%s") did not return the correct type of object '.
+          'from "newResultObject()" (expected a subclass of '.
+          '"PhabricatorLiskDAO", found "%s"). Return an object of the '.
+          'expected type (this is common), or implement a custom '.
+          '"loadPage()" method (this is unusual in modern code).',
+          get_class($this),
+          phutil_describe_type($object)));
+    }
+
+    return $this->loadStandardPage($object);
+  }
+
   protected function loadStandardPage(PhabricatorLiskDAO $table) {
     $rows = $this->loadStandardPageRows($table);
     return $table->loadAllFromArray($rows);