diff --git a/includes/SkinVector.php b/includes/SkinVector.php
index 5ea4d79..3696b22 100644
--- a/includes/SkinVector.php
+++ b/includes/SkinVector.php
@@ -24,6 +24,7 @@
 
 use MediaWiki\MediaWikiServices;
 use Vector\Constants;
+use Wikimedia\WrappedString;
 
 /**
  * Skin subclass for Vector
@@ -140,6 +141,12 @@ class SkinVector extends SkinTemplate {
 		$title = $out->getTitle();
 
 		return [
+			// HTML strings:
+			'html-printtail' => WrappedString::join( "\n", [
+				MWDebug::getDebugHTML( $this->getContext() ),
+				$this->bottomScripts(),
+				wfReportTime( $out->getCSP()->getNonce() )
+			] ) . '</body></html>',
 			'html-sitenotice' => $this->getSiteNotice(),
 			'html-userlangattributes' => $this->prepareUserLanguageAttributes(),
 			'html-subtitle' => $this->prepareSubtitle(),
diff --git a/includes/VectorTemplate.php b/includes/VectorTemplate.php
index 1e2355c..93678de 100644
--- a/includes/VectorTemplate.php
+++ b/includes/VectorTemplate.php
@@ -164,8 +164,6 @@ class VectorTemplate extends BaseTemplate {
 
 			'html-printfooter' => $skin->printSource(),
 			'html-catlinks' => $skin->getCategories(),
-			// From BaseTemplate::getTrail (handles bottom JavaScript)
-			'html-printtail' => $this->getTrail() . '</body></html>',
 			'data-footer' => [
 				'html-hook-vector-before-footer' => $htmlHookVectorBeforeFooter,
 				'array-footer-rows' => $this->getTemplateFooterRows(),