diff --git a/resources/skins.minerva.scripts/search.js b/resources/skins.minerva.scripts/search.js
index 136f3eb..51e51ef 100644
--- a/resources/skins.minerva.scripts/search.js
+++ b/resources/skins.minerva.scripts/search.js
@@ -1,8 +1,10 @@
 ( function ( M ) {
-	var SearchOverlay = M.require( 'mobile.search/SearchOverlay' ),
-		SearchGateway = M.require( 'mobile.search.api/SearchGateway' ),
+	var
+		client = M.require( 'mobile.startup' ),
+		SearchOverlay = client.search.SearchOverlay,
+		SearchGateway = client.search.SearchGateway,
 		overlayManager = M.require( 'skins.minerva.scripts/overlayManager' ),
-		searchLogger = M.require( 'mobile.search/MobileWebSearchLogger' ),
+		searchLogger = client.search.MobileWebSearchLogger,
 		searchInput = $( '#searchInput' ),
 		placeholder = searchInput.attr( 'placeholder' ),
 		searchRoute = new RegExp( /\/search/ ),
diff --git a/skin.json b/skin.json
index 1a4328c..d0ab272 100644
--- a/skin.json
+++ b/skin.json
@@ -396,8 +396,6 @@
 				"mediawiki.Title",
 				"mobile.startup",
 				"skins.minerva.mainMenu",
-				"mobile.search.api",
-				"mobile.search",
 				"mediawiki.user",
 				"mediawiki.storage",
 				"mediawiki.experiments"