diff --git a/domain.module b/domain.module
index f8f4890..1dc7e7a 100644
--- a/domain.module
+++ b/domain.module
@@ -1520,29 +1520,7 @@ function domain_domain_load(&$domain) {
  *   The base url of the requested domain.
  */
 function domain_get_path($domain) {
-  global $base_url;
-  if (empty($base_url)) {
-    return domain_check_scheme($domain['scheme']) .'://'. $domain['subdomain'];
-  }
-  // Badly malfored HTTP_HOST values can cause problems with PHP < 5.3.3,
-  // so we have to suppress error warnings for parse_url here.
-  // See php.net/manual/en/function.parse-url.php.
-  // See http://drupal.org/node/848856.
-  // With PHP > 5.1.2 we can pass a component parameter, too, but Drupal 6
-  // still supports PHP 4 and this code was originally tested there.
-  $url = array();
-  if ($_url = @parse_url($base_url)) {
-    $url = $_url;
-  }
-  // PHP 5 does not return an empty path element.
-  if (!isset($url['path'])) {
-    $url['path'] = '/';
-  }
-  // We need a trailing slash at the end of the path
-  if (substr($url['path'], -1) != '/') {
-    $url['path'] .= '/';
-  }
-  $path = domain_check_scheme($domain['scheme']) .'://'. $domain['subdomain'] . $url['path'];
+  $path = domain_check_scheme($domain['scheme']) .'://'. $domain['subdomain'] . url('<front>');
   return $path;
 }
 
@@ -1567,7 +1545,7 @@ function domain_get_uri($domain) {
     // We cannot use URL here because we need the domain_id data.
     // TODO: use url() but pass a domain_id option?
     domain_path($domain['domain_id'], $request_uri, $options, $_GET['q']);
-    $request_uri = base_path() . $request_uri;
+    $request_uri = url($request_uri);
   }
   // The simple case just uses the inbound path, with the base path present.
   else {