diff --git a/ryu/cfg.py b/ryu/cfg.py
index ea21ea48..ae1d8179 100644
--- a/ryu/cfg.py
+++ b/ryu/cfg.py
@@ -22,17 +22,15 @@ import oslo.config.cfg
 #    b. RyuApp.CONF  (preferred way for ryu applications)
 #    c. oslo.config.cfg.CONF
 #
-# Currently all of above shares a single ConfigOpts instance.
-# We will unshare c. (and stop using it) as soon as ofagent neutron agent
-# is updated.
-# We want to avoid using c. for our options as a python program which embeds
-# ryu applications (eg. neutron agent) might want to put its own set of cli
-# options into it, which can conflict with ours.  (Currently there seems
-# no conflict for the neutron agent.  But who knows?)
+# Currently a. and b. shares a single ConfigOpts instance.
+# We intentionally avoid using c. for our options as a python program
+# which embeds ryu applications (eg. neutron agent) might want to put
+# its own set of cli options into it, which can conflict with ours.
+# (Currently there seems no conflict for the neutron agent.  But who knows?)
 # At some point later we might want to unshare a. and b. as well, in order
 # to allow app-specific options.
 
-CONF = oslo.config.cfg.CONF
+CONF = oslo.config.cfg.ConfigOpts()
 
 # re-export for convenience