diff --git a/cyborg/__init__.py b/cyborg/__init__.py
index b882154a..96fc0fc6 100644
--- a/cyborg/__init__.py
+++ b/cyborg/__init__.py
@@ -12,11 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import eventlet
 import pbr.version
 
 
 __version__ = pbr.version.VersionInfo(
     'openstack-cyborg').version_string()
-
-eventlet.monkey_patch(os=False)
diff --git a/cyborg/cmd/__init__.py b/cyborg/cmd/__init__.py
index b90e7b3b..fd76ac1b 100644
--- a/cyborg/cmd/__init__.py
+++ b/cyborg/cmd/__init__.py
@@ -13,7 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import eventlet
 import oslo_i18n as i18n
 
+eventlet.monkey_patch()
 
 i18n.install('cyborg')