diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 718a2171f..d76425b68 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -563,12 +563,15 @@ function backslashit($string) {
 }
 
 function trailingslashit($string) {
-		if ( '/' != substr($string, -1)) {
+		if ( '/' != substr($string, -1))
 				$string .= '/';
-		}
 		return $string;
 }
 
+function untrailingslashit($string) {
+	return preg_replace('|/+$|', '', $string);
+}
+
 function addslashes_gpc($gpc) {
 	global $wpdb;
 
diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 1d15e0dd5..10de62a71 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -24,7 +24,7 @@ function user_trailingslashit($string, $type_of_url = '') {
 	if ( $wp_rewrite->use_trailing_slashes )
 		$string = trailingslashit($string);
 	else
-		$string = preg_replace('|/+$|', '', $string); // untrailing slash
+		$string = untrailingslashit($string);
 
 	// Note that $type_of_url can be one of following:
 	// single, single_trackback, single_feed, single_paged, feed, category, page, year, month, day, paged