diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index e326d2f40a238facae05df30bbb68ebe11113d7b..5cd223ff8a91358a5498135d7ecf96b54c3b2ada 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -140,21 +140,16 @@ class SimpleSAML_Utilities {
 
 	public static function selfURL() {
 		$selfURLhost = self::selfURLhost();
-		return $selfURLhost . self::getRequestURI();	
-	}
-	
-	public static function getRequestURI() {
-		
-		$requesturi = $_SERVER['REQUEST_URI'];
 
-		if ($requesturi[0] !== '/') {
+		$requestURI = $_SERVER['REQUEST_URI'];
+		if ($requestURI[0] !== '/') {
 			/* We probably have an url on the form: http://server/. */
-			if (preg_match('#^https?://[^/]*(/.*)#i', $requesturi, $matches)) {
-				$requesturi = $matches[1];
+			if (preg_match('#^https?://[^/]*(/.*)#i', $requestURI, $matches)) {
+				$requestURI = $matches[1];
 			}
 		}
 
-		return $requesturi;
+		return $selfURLhost . $requestURI;
 	}
 
 
diff --git a/www/example-simple/hostnames.php b/www/example-simple/hostnames.php
index 7cdcbdd1bb746597f5cbe2d366adc9fc54ffc76b..655f1cb2bf8dc3d35950f87bb6e9e091e0bcf2e7 100644
--- a/www/example-simple/hostnames.php
+++ b/www/example-simple/hostnames.php
@@ -27,7 +27,6 @@ $attributes['Utilities_selfURLNoQuery()'] = array(SimpleSAML_Utilities::selfURLN
 $attributes['Utilities_getSelfHostWithPath()'] = array(SimpleSAML_Utilities::getSelfHostWithPath());
 $attributes['Utilities_getFirstPathElement()'] = array(SimpleSAML_Utilities::getFirstPathElement());
 $attributes['Utilities_selfURL()'] = array(SimpleSAML_Utilities::selfURL());
-$attributes['Utilities_getRequestURI()'] = array(SimpleSAML_Utilities::getRequestURI());