1 files changed, 3 insertions, 13 deletions
diff --git a/lib/rubygems/uri_formatter.rb b/lib/rubygems/uri_formatter.rb
index deac3bfe75..935d9b52ed 100644
--- a/lib/rubygems/uri_formatter.rb
+++ b/lib/rubygems/uri_formatter.rb
@@ -1,3 +1,4 @@
+require 'cgi'
 require 'uri'
 
 class Gem::UriFormatter
@@ -9,7 +10,7 @@ class Gem::UriFormatter
 
   def escape
     return unless @uri
-    escaper.escape @uri
+    CGI.escape @uri
   end
 
   ##
@@ -21,18 +22,7 @@ class Gem::UriFormatter
 
   def unescape
     return unless @uri
-    escaper.unescape @uri
-  end
-
-  private
-
-  def escaper
-    @uri_parser ||=
-      begin
-        URI::Parser.new
-      rescue NameError
-        URI
-      end
+    CGI.unescape @uri
   end
 
 end