diff --git a/tmp/original b/tmp/patched
index 8d5a54025..c15ada282 100644
--- a/tmp/original
+++ b/tmp/patched
@@ -83,10 +83,10 @@ array (
   ),
   'ArticleDeleteComplete' => 
   array (
-    0 => 'Wikibase\\RepoHooks::onArticleDeleteComplete',
-    1 => 'Wikibase\\Client\\Hooks\\DataUpdateHookHandlers::onArticleDeleteComplete',
-    2 => 'Wikibase\\Client\\Hooks\\UpdateRepoHookHandlers::onArticleDeleteComplete',
-    3 => 'CirrusSearch\\Hooks::onArticleDeleteComplete',
+    0 => 'Wikibase\\Client\\Hooks\\DataUpdateHookHandlers::onArticleDeleteComplete',
+    1 => 'Wikibase\\Client\\Hooks\\UpdateRepoHookHandlers::onArticleDeleteComplete',
+    2 => 'CirrusSearch\\Hooks::onArticleDeleteComplete',
+    3 => 'Wikibase\\RepoHooks::onArticleDeleteComplete',
     4 => 'JsonConfig\\JCSingleton::onArticleDeleteComplete',
   ),
   'ArticlePurge' => 
@@ -99,8 +99,8 @@ array (
   ),
   'ArticleUndelete' => 
   array (
-    0 => 'Wikibase\\RepoHooks::onArticleUndelete',
-    1 => 'CirrusSearch\\Hooks::onArticleUndelete',
+    0 => 'CirrusSearch\\Hooks::onArticleUndelete',
+    1 => 'Wikibase\\RepoHooks::onArticleUndelete',
     2 => 'JsonConfig\\JCSingleton::onArticleUndelete',
   ),
   'ArticleViewHeader' => 
@@ -117,8 +117,8 @@ array (
   ),
   'BaseTemplateToolbox' => 
   array (
-    0 => 'Wikibase\\RepoHooks::onBaseTemplateToolbox',
-    1 => 'Wikibase\\ClientHooks::onBaseTemplateToolbox',
+    0 => 'Wikibase\\ClientHooks::onBaseTemplateToolbox',
+    1 => 'Wikibase\\RepoHooks::onBaseTemplateToolbox',
     2 => 'UrlShortenerHooks::onBaseTemplateToolbox',
   ),
   'BeforeCreateEchoEvent' => 
@@ -137,9 +137,9 @@ array (
   ),
   'BeforePageDisplay' => 
   array (
-    0 => 'Wikibase\\RepoHooks::onBeforePageDisplay',
-    1 => 'Wikibase\\ClientHooks::onBeforePageDisplay',
-    2 => 'Wikibase\\ClientHooks::onBeforePageDisplayAddJsConfig',
+    0 => 'Wikibase\\ClientHooks::onBeforePageDisplay',
+    1 => 'Wikibase\\ClientHooks::onBeforePageDisplayAddJsConfig',
+    2 => 'Wikibase\\RepoHooks::onBeforePageDisplay',
     3 => 'WikibaseQuality\\ConstraintReport\\WikibaseQualityConstraintsHooks::onBeforePageDisplay',
     4 => 'Wikibase\\MediaInfo\\WikibaseMediaInfoHooks::onBeforePageDisplay',
     5 => 'UniversalLanguageSelectorHooks::addModules',
@@ -152,8 +152,8 @@ array (
   ),
   'BeforePageDisplayMobile' => 
   array (
-    0 => 'Wikibase\\RepoHooks::onBeforePageDisplayMobile',
-    1 => 'Vector\\Hooks::onBeforePageDisplayMobile',
+    0 => 'Vector\\Hooks::onBeforePageDisplayMobile',
+    1 => 'Wikibase\\RepoHooks::onBeforePageDisplayMobile',
   ),
   'BeforePageRedirect' => 
   array (
@@ -314,8 +314,8 @@ array (
   ),
   'FormatAutocomments' => 
   array (
-    0 => 'Wikibase\\RepoHooks::onFormat',
-    1 => 'Wikibase\\ClientHooks::onFormat',
+    0 => 'Wikibase\\ClientHooks::onFormat',
+    1 => 'Wikibase\\RepoHooks::onFormat',
     2 => 'EntitySchema\\MediaWiki\\EntitySchemaHooks::onFormatAutocomments',
   ),
   'Gadgets::allowLegacy' => 
@@ -348,9 +348,9 @@ array (
   ),
   'GetPreferences' => 
   array (
-    0 => 'Wikibase\\RepoHooks::onGetPreferences',
-    1 => 'Wikibase\\ClientHooks::onGetPreferences',
-    2 => 'CirrusSearch\\Hooks::onGetPreferences',
+    0 => 'Wikibase\\ClientHooks::onGetPreferences',
+    1 => 'CirrusSearch\\Hooks::onGetPreferences',
+    2 => 'Wikibase\\RepoHooks::onGetPreferences',
     3 => 'Wikibase\\MediaInfo\\WikibaseMediaInfoHooks::onGetPreferences',
     4 => 'UniversalLanguageSelectorHooks::onGetPreferences',
     5 => 'BetaFeaturesHooks::getPreferences',
@@ -383,8 +383,8 @@ array (
   ),
   'InfoAction' => 
   array (
-    0 => 'Wikibase\\RepoHooks::onInfoAction',
-    1 => 'Wikibase\\Client\\Hooks\\InfoActionHookHandler::onInfoAction',
+    0 => 'Wikibase\\Client\\Hooks\\InfoActionHookHandler::onInfoAction',
+    1 => 'Wikibase\\RepoHooks::onInfoAction',
     2 => 'Wikibase\\Lexeme\\WikibaseLexemeHooks::onInfoAction',
   ),
   'LanguageGetTranslatedLanguageNames' => 
@@ -404,9 +404,9 @@ array (
   ),
   'LoadExtensionSchemaUpdates' => 
   array (
-    0 => 'Wikibase\\Repo\\Store\\Sql\\DatabaseSchemaUpdater::onSchemaUpdate',
-    1 => 'Wikibase\\Repo\\Store\\Sql\\ChangesSubscriptionSchemaUpdater::onSchemaUpdate',
-    2 => 'Wikibase\\Client\\Usage\\Sql\\SqlUsageTrackerSchemaUpdater::onSchemaUpdate',
+    0 => 'Wikibase\\Client\\Usage\\Sql\\SqlUsageTrackerSchemaUpdater::onSchemaUpdate',
+    1 => 'Wikibase\\Repo\\Store\\Sql\\DatabaseSchemaUpdater::onSchemaUpdate',
+    2 => 'Wikibase\\Repo\\Store\\Sql\\ChangesSubscriptionSchemaUpdater::onSchemaUpdate',
     3 => 'WikibaseQuality\\ConstraintReport\\WikibaseQualityConstraintsHooks::onCreateSchema',
     4 => 'EntitySchema\\MediaWiki\\EntitySchemaHooks::onCreateDBSchema',
     5 => 'PropertySuggester\\Hooks::onCreateSchema',
@@ -507,8 +507,8 @@ array (
   ),
   'OutputPageParserOutput' => 
   array (
-    0 => 'Wikibase\\RepoHooks::onOutputPageParserOutput',
-    1 => 'Wikibase\\Client\\Hooks\\SidebarHookHandlers::onOutputPageParserOutput',
+    0 => 'Wikibase\\Client\\Hooks\\SidebarHookHandlers::onOutputPageParserOutput',
+    1 => 'Wikibase\\RepoHooks::onOutputPageParserOutput',
     2 => 'MobileFrontendHooks::onOutputPageParserOutput',
   ),
   'PageContentInsertComplete' => 
@@ -657,8 +657,8 @@ array (
   ),
   'ShowSearchHitTitle' => 
   array (
-    0 => 'Wikibase\\Repo\\Hooks\\ShowSearchHitHandler::onShowSearchHitTitle',
-    1 => 'CirrusSearch\\Hooks::onShowSearchHitTitle',
+    0 => 'CirrusSearch\\Hooks::onShowSearchHitTitle',
+    1 => 'Wikibase\\Repo\\Hooks\\ShowSearchHitHandler::onShowSearchHitTitle',
     2 => 'Wikibase\\Search\\Elastic\\CirrusShowSearchHitHandler::onShowSearchHitTitle',
   ),
   'SidebarBeforeOutput' => 
@@ -777,9 +777,9 @@ array (
   ),
   'UnitTestsList' => 
   array (
-    0 => 'Wikibase\\RepoHooks::registerUnitTests',
-    1 => 'Wikibase\\ClientHooks::registerUnitTests',
-    2 => 'CirrusSearch\\Hooks::onUnitTestsList',
+    0 => 'Wikibase\\ClientHooks::registerUnitTests',
+    1 => 'CirrusSearch\\Hooks::onUnitTestsList',
+    2 => 'Wikibase\\RepoHooks::registerUnitTests',
     3 => 'Wikibase\\LibHooks::registerPhpUnitTests',
     4 => 'Wikibase\\ViewHooks::onUnitTestsList',
   ),