diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index db5c034ccf95..a49c8f485859 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -327,6 +327,7 @@ ajaxify = window.ajaxify || {};
 	require(['translator', 'benchpress'], function (translator, Benchpress) {
 		translator.translate('[[error:no-connection]]');
 		Benchpress.registerLoader(ajaxify.loadTemplate);
+		Benchpress.setGlobal('config', config);
 	});
 }());
 
diff --git a/public/src/app.js b/public/src/app.js
index c40bc607ef4f..d64f81ce00ac 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -15,22 +15,6 @@ app.cacheBuster = null;
 	var registerMessage = params.register;
 	var isTouchDevice = utils.isTouchDevice();
 
-	require(['benchpress'], function (Benchpress) {
-		Benchpress.setGlobal('config', config);
-		if (Object.defineProperty) {
-			Object.defineProperty(window, 'templates', {
-				configurable: true,
-				enumerable: true,
-				get: function () {
-					console.warn('[deprecated] Accessing benchpress (formerly known as templates.js) globally is deprecated. Use `require(["benchpress"], function (Benchpress) { ... })` instead');
-					return Benchpress;
-				},
-			});
-		} else {
-			window.templates = Benchpress;
-		}
-	});
-
 	app.cacheBuster = config['cache-buster'];
 
 	bootbox.setDefaults({