diff --git a/src/Url.php b/src/Url.php
index 36875b5..a739f57 100644
--- a/src/Url.php
+++ b/src/Url.php
@@ -472,9 +472,7 @@ class Url {
   public static function remove_trailing_slash($url) {
     if ($url == '/')
       return $url;
-    elseif (substr($url, -1) == '/')
-      return substr($url, 0, -1);
-    return $url;
+    return rtrim($url, '/');
   }
 
   /**