diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini
index fd8d646610..2e9e06e4b1 100644
--- a/etc/dhcp_agent.ini
+++ b/etc/dhcp_agent.ini
@@ -46,4 +46,4 @@ dhcp_driver = quantum.agent.linux.dhcp.Dnsmasq
 # enable_metadata_network = False
 
 # The Quantum DHCP agent manager.
-# dhcp_agent_manager = quantum.agent.dhcp_agent.DhcpAgentWithStateReport
+# dhcp_agent_manager = quantum.agent.dhcp_agent.DhcpAgent
diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py
index fda604cd86..532647b9e3 100644
--- a/quantum/agent/dhcp_agent.py
+++ b/quantum/agent/dhcp_agent.py
@@ -66,8 +66,7 @@ class DhcpAgent(manager.Manager):
                            "dedicate network. Requires "
                            "enable isolated_metadata = True ")),
         cfg.StrOpt('dhcp_agent_manager',
-                   default='quantum.agent.dhcp_agent.'
-                   'DhcpAgentWithStateReport',
+                   default='quantum.agent.dhcp_agent.DhcpAgent',
                    help=_("The Quantum DHCP agent manager.")),
     ]