diff --git a/bin/keystone-all b/bin/keystone-all
index f5ba56d13d..beec3dfc5e 100755
--- a/bin/keystone-all
+++ b/bin/keystone-all
@@ -39,11 +39,7 @@ from keystone.openstack.common import gettextutils
 # NOTE(blk-u):
 # gettextutils.install() must run to set _ before importing any modules that
 # contain static translated strings.
-#
-# Configure gettextutils for deferred translation of messages
-# so that error messages in responses can be translated according to the
-# Accept-Language in the request rather than the Keystone server locale.
-gettextutils.install('keystone', lazy=True)
+gettextutils.install('keystone')
 
 from keystone.common import environment
 from keystone.common import utils
diff --git a/httpd/keystone.py b/httpd/keystone.py
index 50ae07ea56..aa057136ca 100644
--- a/httpd/keystone.py
+++ b/httpd/keystone.py
@@ -24,11 +24,7 @@ from keystone.openstack.common import gettextutils
 # NOTE(blk-u):
 # gettextutils.install() must run to set _ before importing any modules that
 # contain static translated strings.
-#
-# Configure gettextutils for deferred translation of messages
-# so that error messages in responses can be translated according to the
-# Accept-Language in the request rather than the Keystone server locale.
-gettextutils.install('keystone', lazy=True)
+gettextutils.install('keystone')
 
 from keystone.common import environment
 from keystone import config