diff --git a/manila/cmd/api.py b/manila/cmd/api.py
index 07c6f5eb2c..42db0501a5 100644
--- a/manila/cmd/api.py
+++ b/manila/cmd/api.py
@@ -28,9 +28,6 @@ from oslo_log import log
 from oslo_reports import guru_meditation_report as gmr
 from oslo_reports import opts as gmr_opts
 
-from manila import i18n
-i18n.enable_lazy()
-
 from manila.common import config  # Need to register global_opts  # noqa
 from manila import service
 from manila import utils
diff --git a/manila/cmd/data.py b/manila/cmd/data.py
index 9b232a53f5..3eefafbb4f 100644
--- a/manila/cmd/data.py
+++ b/manila/cmd/data.py
@@ -26,8 +26,6 @@ from oslo_log import log
 from oslo_reports import guru_meditation_report as gmr
 from oslo_reports import opts as gmr_opts
 
-from manila import i18n
-i18n.enable_lazy()
 from manila.common import config  # Need to register global_opts  # noqa
 from manila import service
 from manila import utils
diff --git a/manila/cmd/manage.py b/manila/cmd/manage.py
index cdfc2594d1..41907b72fb 100644
--- a/manila/cmd/manage.py
+++ b/manila/cmd/manage.py
@@ -58,9 +58,6 @@ from __future__ import print_function
 import os
 import sys
 
-from manila import i18n
-i18n.enable_lazy()
-
 from oslo_config import cfg
 from oslo_log import log
 from oslo_utils import uuidutils
diff --git a/manila/cmd/scheduler.py b/manila/cmd/scheduler.py
index 6add38fd00..6c0546742a 100644
--- a/manila/cmd/scheduler.py
+++ b/manila/cmd/scheduler.py
@@ -28,8 +28,6 @@ from oslo_log import log
 from oslo_reports import guru_meditation_report as gmr
 from oslo_reports import opts as gmr_opts
 
-from manila import i18n
-i18n.enable_lazy()
 from manila.common import config  # Need to register global_opts  # noqa
 from manila import service
 from manila import utils
diff --git a/manila/cmd/share.py b/manila/cmd/share.py
index 2b62192c9e..5822a2ec54 100644
--- a/manila/cmd/share.py
+++ b/manila/cmd/share.py
@@ -27,9 +27,6 @@ from oslo_log import log
 from oslo_reports import guru_meditation_report as gmr
 from oslo_reports import opts as gmr_opts
 
-from manila import i18n
-i18n.enable_lazy()
-
 from manila.common import config  # Need to register global_opts  # noqa
 from manila import service
 from manila import utils
diff --git a/manila/i18n.py b/manila/i18n.py
index 70b0c9be3f..a186a25797 100644
--- a/manila/i18n.py
+++ b/manila/i18n.py
@@ -28,10 +28,6 @@ _translators = oslo_i18n.TranslatorFactory(domain=DOMAIN)
 _ = _translators.primary
 
 
-def enable_lazy():
-    return oslo_i18n.enable_lazy()
-
-
 def translate(value, user_locale):
     return oslo_i18n.translate(value, user_locale)
 
diff --git a/manila/test.py b/manila/test.py
index 5b6da80018..ab2273ad41 100644
--- a/manila/test.py
+++ b/manila/test.py
@@ -29,7 +29,6 @@ import mock
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_config import fixture as config_fixture
-import oslo_i18n
 import oslo_messaging
 from oslo_messaging import conffixture as messaging_conffixture
 from oslo_utils import uuidutils
@@ -108,7 +107,6 @@ class TestCase(base_test.BaseTestCase):
         """Run before each test method to initialize test environment."""
         super(TestCase, self).setUp()
 
-        oslo_i18n.enable_lazy(enable=False)
         conf_fixture.set_defaults(CONF)
         CONF([], default_config_files=[])
 
diff --git a/manila/wsgi/wsgi.py b/manila/wsgi/wsgi.py
index 31ac2621e7..4640c95396 100644
--- a/manila/wsgi/wsgi.py
+++ b/manila/wsgi/wsgi.py
@@ -19,9 +19,6 @@ from oslo_config import cfg
 from oslo_log import log
 from oslo_service import wsgi
 
-from manila import i18n
-i18n.enable_lazy()
-
 # Need to register global_opts
 from manila.common import config
 from manila import rpc