2 files changed, 5 insertions, 9 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 51d2e7c9d3..98e16c9294 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -523,9 +523,11 @@ module Net   #:nodoc:
 
     # returns true if use SSL/TLS with HTTP.
     def use_ssl?
-      false   # redefined in net/https
+      @use_ssl
     end
 
+    alias use_ssl use_ssl?   #:nodoc: obsolete
+
     # Opens TCP connection and HTTP session.
     # 
     # When this method is called with block, gives a HTTP object
diff --git a/lib/net/https.rb b/lib/net/https.rb
index fb329df43d..8268c04885 100644
--- a/lib/net/https.rb
+++ b/lib/net/https.rb
@@ -104,13 +104,6 @@ require 'openssl'
 module Net
 
   class HTTP
-    remove_method :use_ssl?
-    def use_ssl?
-      @use_ssl
-    end
-
-    alias use_ssl use_ssl?   # for backward compatibility
-
     # Turn on/off SSL.
     # This flag must be set before starting session.
     # If you change use_ssl value after session started,
@@ -160,7 +153,8 @@ module Net
       @ssl_context.timeout = sec
     end
 
-    alias timeout= ssl_timeout=   # for backward compatibility
+    # For backward compatibility
+    alias timeout= ssl_timeout=
 
     def peer_cert
       return nil if not use_ssl? or not @socket