diff --git a/gunicorn/workers/ggevent_wsgi.py b/gunicorn/workers/ggevent_wsgi.py
deleted file mode 100644
index cb5985b3..00000000
--- a/gunicorn/workers/ggevent_wsgi.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -
-#
-# This file is part of gunicorn released under the MIT license.
-# See the NOTICE for more information.
-
-from datetime import datetime
-
-from gunicorn.workers.ggevent import BASE_WSGI_ENV, GeventWorker
-from gevent import wsgi
-
-
-class WSGIHandler(wsgi.WSGIHandler):
-
-    @property
-    def status(self):
-        return ' '.join([str(self.code), self.reason])
-
-    def log_request(self, length):
-        self.response_length = length
-        response_time = datetime.now() - self.time_start
-        self.server.log.access(self, self.environ, response_time)
-
-    def prepare_env(self):
-        env = super(WSGIHandler, self).prepare_env()
-        env['RAW_URI'] = self.request.uri
-        self.environ = env
-        return env
-
-    def handle(self):
-        self.time_start = datetime.now()
-        super(WSGIHandler, self).handle()
-
-
-class WSGIServer(wsgi.WSGIServer):
-    base_env = BASE_WSGI_ENV
-
-class GeventWSGIWorker(GeventWorker):
-    "The Gevent StreamServer based workers."
-    server_class = WSGIServer
-    wsgi_handler = WSGIHandler
diff --git a/setup.py b/setup.py
index 8d2f24d9..58411ff1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -
 #
-# This file is part of gunicorn released under the MIT license. 
+# This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.
 
 
@@ -45,9 +45,9 @@ setup(
     zip_safe = False,
     packages = find_packages(exclude=['examples', 'tests']),
     include_package_data = True,
-    
+
     entry_points="""
-    
+
     [console_scripts]
     gunicorn=gunicorn.app.wsgiapp:run
     gunicorn_django=gunicorn.app.djangoapp:run
@@ -57,7 +57,7 @@ setup(
     sync=gunicorn.workers.sync:SyncWorker
     eventlet=gunicorn.workers.geventlet:EventletWorker
     gevent=gunicorn.workers.ggevent:GeventWorker
-    gevent_wsgi=gunicorn.workers.ggevent_wsgi:GeventWSGIWorker
+    gevent_wsgi=gunicorn.workers.ggevent_wsgi:GeventPyWSGIWorker
     gevent_pywsgi=gunicorn.workers.ggevent:GeventPyWSGIWorker
     tornado=gunicorn.workers.gtornado:TornadoWorker