diff --git a/includes/HookContainer/HookRunner.php b/includes/HookContainer/HookRunner.php
index 005efbf0f9a..0c52df3d970 100644
--- a/includes/HookContainer/HookRunner.php
+++ b/includes/HookContainer/HookRunner.php
@@ -2826,12 +2826,11 @@ class HookRunner implements
 	}
 
 	public function onPageSaveComplete( $wikiPage, $user, $summary, $flags,
-		$revisionRecord, $originalRevId, $undidRevId
+		$revisionRecord, $editResult
 	) {
 		return $this->container->run(
 			'PageSaveComplete',
-			[ $wikiPage, $user, $summary, $flags, $revisionRecord,
-				$originalRevId, $undidRevId ]
+			[ $wikiPage, $user, $summary, $flags, $revisionRecord, $editResult ]
 		);
 	}
 
diff --git a/includes/Storage/Hook/PageSaveCompleteHook.php b/includes/Storage/Hook/PageSaveCompleteHook.php
index 4535a656d94..26b4985ac1c 100644
--- a/includes/Storage/Hook/PageSaveCompleteHook.php
+++ b/includes/Storage/Hook/PageSaveCompleteHook.php
@@ -3,6 +3,7 @@
 namespace MediaWiki\Storage\Hook;
 
 use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Storage\EditResult;
 use MediaWiki\User\UserIdentity;
 use WikiPage;
 
@@ -21,10 +22,9 @@ interface PageSaveCompleteHook {
 	 * @param string $summary Edit summary/comment
 	 * @param int $flags Flags passed to WikiPage::doEditContent()
 	 * @param RevisionRecord $revisionRecord New RevisionRecord of the article
-	 * @param int|bool $originalRevId If the edit restores or repeats an earlier revision (such as a
-	 *   rollback or a null revision), the ID of that earlier revision. False otherwise.
-	 *   (Used to be called $baseRevId.)
-	 * @param int $undidRevId Rev ID (or 0) this edit undid
+	 * @param EditResult $editResult Object storing information about the effects of this edit,
+	 *   including which edits were reverted and which edit is this based on (for reverts and null
+	 *   edits).
 	 * @return bool|void True or no return value to continue or false to stop other hook handlers
 	 *    from being called; save cannot be aborted
 	 */
@@ -34,7 +34,6 @@ interface PageSaveCompleteHook {
 		$summary,
 		$flags,
 		$revisionRecord,
-		$originalRevId,
-		$undidRevId
+		$editResult
 	);
 }
diff --git a/includes/Storage/PageUpdater.php b/includes/Storage/PageUpdater.php
index 207e95b40fe..0c60ac26510 100644
--- a/includes/Storage/PageUpdater.php
+++ b/includes/Storage/PageUpdater.php
@@ -1322,8 +1322,7 @@ class PageUpdater {
 					$summary->text,
 					$flags,
 					$newRevisionRecord,
-					$editResult->getOriginalRevisionId(),
-					$editResult->getUndidRevId()
+					$editResult
 				);
 
 				// Deprecated since 1.35