diff --git a/heat/api/aws/ec2token.py b/heat/api/aws/ec2token.py
index bb7837f9e3..6a28e79233 100644
--- a/heat/api/aws/ec2token.py
+++ b/heat/api/aws/ec2token.py
@@ -19,15 +19,12 @@ import webob
 
 from heat.api.aws import exception
 from heat.api.aws.exception import HeatAPIException
+from heat.common.i18n import _
 from heat.common import wsgi
-from heat.openstack.common import gettextutils
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import importutils
 from heat.openstack.common import jsonutils as json
 from heat.openstack.common import log as logging
 
-gettextutils.install('heat')
-
 LOG = logging.getLogger(__name__)
 
 
diff --git a/heat/api/aws/exception.py b/heat/api/aws/exception.py
index b62cf1ab2a..7fc83994d4 100644
--- a/heat/api/aws/exception.py
+++ b/heat/api/aws/exception.py
@@ -19,8 +19,8 @@
 import six
 import webob.exc
 
+from heat.common.i18n import _
 from heat.common import serializers
-from heat.openstack.common.gettextutils import _
 
 
 class HeatAPIException(webob.exc.HTTPError):
diff --git a/heat/api/aws/utils.py b/heat/api/aws/utils.py
index f5d6469d52..fcb5670ec6 100644
--- a/heat/api/aws/utils.py
+++ b/heat/api/aws/utils.py
@@ -19,7 +19,7 @@ import itertools
 import re
 
 from heat.api.aws import exception
-from heat.openstack.common.gettextutils import _
+from heat.common.i18n import _
 from heat.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/heat/api/cfn/__init__.py b/heat/api/cfn/__init__.py
index b890684b90..3fb8f16a06 100644
--- a/heat/api/cfn/__init__.py
+++ b/heat/api/cfn/__init__.py
@@ -13,9 +13,6 @@
 
 from heat.api.cfn import versions
 from heat.api.middleware.version_negotiation import VersionNegotiationFilter
-from heat.openstack.common import gettextutils
-
-gettextutils.install('heat')
 
 
 def version_negotiation_filter(app, conf, **local_conf):
diff --git a/heat/api/cfn/v1/stacks.py b/heat/api/cfn/v1/stacks.py
index c4e1f59ea6..c14ff584d9 100644
--- a/heat/api/cfn/v1/stacks.py
+++ b/heat/api/cfn/v1/stacks.py
@@ -21,12 +21,12 @@ import socket
 from heat.api.aws import exception
 from heat.api.aws import utils as api_utils
 from heat.common import exception as heat_exception
+from heat.common.i18n import _
 from heat.common import identifier
 from heat.common import policy
 from heat.common import template_format
 from heat.common import urlfetch
 from heat.common import wsgi
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 from heat.rpc import api as engine_api
 from heat.rpc import client as rpc_client
diff --git a/heat/api/cloudwatch/__init__.py b/heat/api/cloudwatch/__init__.py
index 613b008735..f852d1528f 100644
--- a/heat/api/cloudwatch/__init__.py
+++ b/heat/api/cloudwatch/__init__.py
@@ -14,13 +14,16 @@
 import routes
 from webob import Request
 
+from oslo import i18n
+
 from heat.api.cloudwatch import versions
 from heat.api.cloudwatch import watch
 from heat.api.middleware.version_negotiation import VersionNegotiationFilter
 from heat.common import wsgi
-from heat.openstack.common import gettextutils
 
-gettextutils.install('heat')
+# FIXME(elynn): Since install() is deprecated, we should remove it in the
+# future.
+i18n.install('heat')
 
 
 class API(wsgi.Router):
diff --git a/heat/api/cloudwatch/watch.py b/heat/api/cloudwatch/watch.py
index a0da8a1901..219f50de20 100644
--- a/heat/api/cloudwatch/watch.py
+++ b/heat/api/cloudwatch/watch.py
@@ -20,9 +20,9 @@ import six
 from heat.api.aws import exception
 from heat.api.aws import utils as api_utils
 from heat.common import exception as heat_exception
+from heat.common.i18n import _
 from heat.common import policy
 from heat.common import wsgi
-from heat.openstack.common.gettextutils import _
 from heat.openstack.common import log as logging
 from heat.rpc import api as engine_api
 from heat.rpc import client as rpc_client
diff --git a/heat/api/openstack/v1/util.py b/heat/api/openstack/v1/util.py
index a0165aed8f..3660c68c8d 100644
--- a/heat/api/openstack/v1/util.py
+++ b/heat/api/openstack/v1/util.py
@@ -16,8 +16,8 @@ from functools import wraps
 import six
 from webob import exc
 
+from heat.common.i18n import _
 from heat.common import identifier
-from heat.openstack.common.gettextutils import _
 
 
 def policy_enforce(handler):