diff --git a/charms_openstack/charm/core.py b/charms_openstack/charm/core.py
index 4846e6c..4e1a5cb 100644
--- a/charms_openstack/charm/core.py
+++ b/charms_openstack/charm/core.py
@@ -21,7 +21,11 @@ import charms.reactive.relations as relations
 import charms_openstack.adapters as os_adapters
 import charms_openstack.ip as os_ip
 
-from charms_openstack.charm import defaults as os_defaults
+
+# Used to store the discovered release version for caching between invocations
+OPENSTACK_RELEASE_KEY = 'charmers.openstack-release-version'
+OPENSTACK_PACKAGE_TYPE_KEY = 'charmers.openstack-package-type'
+
 
 # _releases{} is a dictionary of release -> class that is instantiated
 # according to the the release that is being requested.  i.e. a charm can
@@ -905,7 +909,7 @@ class BaseOpenStackCharmActions(object):
             hookenv.status_set('maintenance', 'Running openstack upgrade')
             new_src = self.config['openstack-origin']
             new_os_rel = os_utils.get_os_codename_install_source(new_src)
-            unitdata.kv().set(os_defaults.OPENSTACK_RELEASE_KEY,
+            unitdata.kv().set(OPENSTACK_RELEASE_KEY,
                               new_os_rel)
             target_charm = get_charm_instance(new_os_rel)
             target_charm.do_openstack_pkg_upgrade()
diff --git a/charms_openstack/charm/defaults.py b/charms_openstack/charm/defaults.py
index 0ea7e48..fd0b698 100644
--- a/charms_openstack/charm/defaults.py
+++ b/charms_openstack/charm/defaults.py
@@ -5,6 +5,8 @@ import charms.reactive as reactive
 from charms_openstack.charm.classes import OpenStackCharm
 from charms_openstack.charm.core import register_os_release_selector
 from charms_openstack.charm.core import register_package_type_selector
+from charms_openstack.charm.core import OPENSTACK_RELEASE_KEY
+from charms_openstack.charm.core import OPENSTACK_PACKAGE_TYPE_KEY
 
 # The default handlers that charms.openstack provides.
 ALLOWED_DEFAULT_HANDLERS = [
@@ -24,10 +26,6 @@ ALLOWED_DEFAULT_HANDLERS = [
 # Where to store the default handler functions for each default state
 _default_handler_map = {}
 
-# Used to store the discovered release version for caching between invocations
-OPENSTACK_RELEASE_KEY = 'charmers.openstack-release-version'
-OPENSTACK_PACKAGE_TYPE_KEY = 'charmers.openstack-package-type'
-
 
 def use_defaults(*defaults):
     """Activate the default functionality for various handlers