diff --git a/lib/WebGUI/Session/Url.pm b/lib/WebGUI/Session/Url.pm
index 4c3fe415e..fe620764a 100644
--- a/lib/WebGUI/Session/Url.pm
+++ b/lib/WebGUI/Session/Url.pm
@@ -323,11 +323,8 @@ Returns the URL of the page requested (no gateway, no query params, just the pag
 
 sub getRequestedUrl {
 	my $self = shift;
-	return undef unless (my $request = $self->session->request);
 	unless ($self->{_requestedUrl}) {
-		$self->{_requestedUrl} = decode_utf8($request->path_info); # TODO - is path_info right?
-		my $gateway = $request->base->path;
-		$self->{_requestedUrl} =~ s/^$gateway([^?]*)\??.*$/$1/;
+		$self->{_requestedUrl} = decode_utf8($self->session->request->path_info);
 	}
 	return $self->{_requestedUrl};
 }