diff --git a/openstack-common.conf b/openstack-common.conf
index 3dd7673a6b3..a1a35b76b10 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -1,7 +1,32 @@
 [DEFAULT]
 
 # The list of modules to copy from openstack-common
-modules=exception,excutils,gettextutils,importutils,jsonutils,local,rootwrap,rpc,timeutils,log,setup,notifier,context,network_utils,policy,uuidutils,lockutils,fileutils,gettextutils,scheduler,scheduler.filters,scheduler.weights,install_venv_common,flakes,version,strutils,processutils
+module=context
+module=exception
+module=excutils
+module=fileutils
+module=flakes
+module=gettextutils
+module=importutils
+module=install_venv_common
+module=jsonutils
+module=local
+module=lockutils
+module=log
+module=network_utils
+module=notifier
+module=policy
+module=processutils
+module=rootwrap
+module=rpc
+module=scheduler
+module=scheduler.filters
+module=scheduler.weights
+module=setup
+module=strutils
+module=timeutils
+module=uuidutils
+module=version
 
 # The base module to hold the copy of openstack.common
 base=cinder