diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index de1b38fc6dba29d8329646a4527075326f0287bd..e1b96ab3a2fba7d21e93e68eefec3dad4aa94c62 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -24,7 +24,6 @@ class SimpleSAML_XHTML_Template {
 	private $language = null;
 	
 	private $langtext = null;
-	private $usebasetheme = false;
 	
 	public $data = null;
 
@@ -136,17 +135,7 @@ class SimpleSAML_XHTML_Template {
 		$data = $this->data;
 		$filename = $this->configuration->getPathValue('templatedir') . $this->configuration->getValue('theme.use') . '/' . $file;
 
-		if ($this->usebasetheme) {
-			SimpleSAML_Logger::error($_SERVER['PHP_SELF'].' - Template: Using base for inclusion');
-			
-			$filename = $this->configuration->getPathValue('templatedir') . $this->configuration->getValue('theme.base') . '/' . $file;
-			if (!file_exists($filename)) {
-				SimpleSAML_Logger::error($_SERVER['PHP_SELF'].' - Template: Could not find template file [' . $file . 
-					'] at [' . $filename . ']');
-				throw new Exception('Could not load template file [' . $file . ']');
-			}
-			
-		} elseif (!file_exists($filename)) {
+		if (!file_exists($filename)) {
 		
 			SimpleSAML_Logger::error($_SERVER['PHP_SELF'].' - Template: Could not find template file [' . $file . 
 				'] at [' . $filename . '] - Now trying at base');
@@ -271,7 +260,6 @@ class SimpleSAML_XHTML_Template {
 		if (!file_exists($filename)) {
 			SimpleSAML_Logger::warning($_SERVER['PHP_SELF'].' - Template: Could not find template file [' . $this->template . '] at [' . $filename . '] - now trying the base template');
 			
-			$this->usebasetheme = true;
 			
 			$filename = $this->configuration->getPathValue('templatedir') . 
 				$this->configuration->getValue('theme.base') . '/' . $this->template;