diff --git a/config-templates/config.php b/config-templates/config.php
index d957796f4bdc3b9e518865aa16737573b497cd9e..41b185a50417c8c5aa4097284394b748b2f220ad 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -172,10 +172,9 @@ $config = array (
 	'language.default'		=> 'en',
 	
 	/*
-	 * Which theme directory should be used? The base is fallback (leave it to default).
+	 * Which theme directory should be used?
 	 */
 	'theme.use' 		=> 'default',
-	'theme.base' 		=> 'default',
 
 	
 	/*
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index 4646fea3d3563cc30ff80e733da4486d3ca39e81..6be9cb57891fb6267e34d024a9d48c1d189e9729 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -531,13 +531,12 @@ class SimpleSAML_XHTML_Template {
 
 
 		/* Try default theme. */
-		$baseTheme = $this->configuration->getString('theme.base', 'default');
 		if ($templateModule !== 'default') {
-			/* .../module/<templateModule>/templates/<baseTheme>/<templateName> */
+			/* .../module/<templateModule>/templates/<templateName> */
 			$filename = SimpleSAML_Module::getModuleDir($templateModule) . '/templates/' . $templateName;
 			
 		} else {
-			/* .../templates/<baseTheme>/<templateName> */
+			/* .../templates/<templateName> */
 			$filename = $this->configuration->getPathValue('templatedir', 'templates/') . '/' . $templateName;
 		}