diff --git a/openstack-common.conf b/openstack-common.conf
index f9d38ea1d71d..b0db41d512b8 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 
 # The list of modules to copy from openstack-common
-modules=cfg,cliutils,context,excutils,eventlet_backdoor,fileutils,gettextutils,importutils,iniparser,jsonutils,local,lockutils,log,network_utils,notifier,plugin,policy,rootwrap,setup,timeutils,rpc,uuidutils,install_venv_common
+modules=cfg,cliutils,context,excutils,eventlet_backdoor,fileutils,gettextutils,importutils,iniparser,jsonutils,local,lockutils,log,network_utils,notifier,plugin,policy,rootwrap,setup,timeutils,rpc,uuidutils,install_venv_common,flakes
 
 # The base module to hold the copy of openstack.common
 base=nova
diff --git a/tools/flakes.py b/tools/flakes.py
index f805fd15645f..7f96116ca549 100644
--- a/tools/flakes.py
+++ b/tools/flakes.py
@@ -2,21 +2,14 @@
  wrapper for pyflakes to ignore gettext based warning:
      "undefined name '_'"
 
- From https://bugs.launchpad.net/pyflakes/+bug/844592
+ Synced in from openstack-common
 """
-import __builtin__
-import os
 import sys
 
+import pyflakes.checker
 from pyflakes.scripts import pyflakes
 
 if __name__ == "__main__":
-    names = os.environ.get('PYFLAKES_BUILTINS', '_')
-    names = [x.strip() for x in names.split(',')]
-    for x in names:
-        if not hasattr(__builtin__, x):
-            setattr(__builtin__, x, True)
-
-    del names, os, __builtin__
-
+    orig_builtins = set(pyflakes.checker._MAGIC_GLOBALS)
+    pyflakes.checker._MAGIC_GLOBALS = orig_builtins | set(['_'])
     sys.exit(pyflakes.main())