diff --git a/phpBB/includes/template/context.php b/phpBB/includes/template/context.php
index 4689cf2d77..498568e5f4 100644
--- a/phpBB/includes/template/context.php
+++ b/phpBB/includes/template/context.php
@@ -82,26 +82,6 @@ class phpbb_template_context
 		return true;
 	}
 
-	/**
-	* Get (non-referenced) rootref
-	*
-	* @return array
-	*/
-	public function get_rootref()
-	{
-		return $this->rootref;
-	}
-
-	/**
-	* Get (non-referenced) tpldata
-	*
-	* @return array
-	*/
-	public function get_tpldata()
-	{
-		return $this->tpldata;
-	}
-
 	/**
 	* Returns a reference to template data array.
 	*
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index f5879c6027..717213ea1f 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -432,12 +432,11 @@ class phpbb_template_twig implements phpbb_template
 	*/
 	public function get_template_vars()
 	{
-		$vars = array();
+		$context_vars = $this->context->get_data_ref();
 
 		$vars = array_merge(
-			$vars,
-			$this->context->get_rootref(),
-			$this->context->get_tpldata(),
+			$context_vars['.'][0], // To get normal vars
+			$context_vars, // To get loops
 			array(
 				'definition'	=> new phpbb_template_twig_definition(),
 				'user'			=> $this->user,