diff --git a/ansible/openstack/templates/dnsmasq-neutron.conf b/ansible/openstack/templates/dnsmasq-neutron.conf
deleted file mode 100644
index 7bcbd9d..0000000
--- a/ansible/openstack/templates/dnsmasq-neutron.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-dhcp-option-force=26,1454
-
diff --git a/ansible/roles/neutron-compute/templates/dhcp_agent.ini b/ansible/roles/neutron-compute/templates/dhcp_agent.ini
index 19eb62e..6f845c3 100644
--- a/ansible/roles/neutron-compute/templates/dhcp_agent.ini
+++ b/ansible/roles/neutron-compute/templates/dhcp_agent.ini
@@ -62,7 +62,6 @@ dhcp_domain = openstacklocal
 
 # Override the default dnsmasq settings with this file
 # dnsmasq_config_file =
-dnsmasq_config_file = /etc/neutron/dnsmasq-neutron.conf
 
 # Comma-separated list of DNS servers which will be used by dnsmasq
 # as forwarders.
diff --git a/ansible/roles/neutron-controller/templates/dhcp_agent.ini b/ansible/roles/neutron-controller/templates/dhcp_agent.ini
index 19eb62e..6f845c3 100644
--- a/ansible/roles/neutron-controller/templates/dhcp_agent.ini
+++ b/ansible/roles/neutron-controller/templates/dhcp_agent.ini
@@ -62,7 +62,6 @@ dhcp_domain = openstacklocal
 
 # Override the default dnsmasq settings with this file
 # dnsmasq_config_file =
-dnsmasq_config_file = /etc/neutron/dnsmasq-neutron.conf
 
 # Comma-separated list of DNS servers which will be used by dnsmasq
 # as forwarders.
diff --git a/ansible/roles/neutron-network/tasks/main.yml b/ansible/roles/neutron-network/tasks/main.yml
index 9b41ac1..8a55374 100644
--- a/ansible/roles/neutron-network/tasks/main.yml
+++ b/ansible/roles/neutron-network/tasks/main.yml
@@ -66,10 +66,6 @@
   template: src=dhcp_agent.ini dest=/etc/neutron/dhcp_agent.ini
             backup=yes
 
-- name: update dnsmasq-neutron.conf
-  template: src=templates/dnsmasq-neutron.conf
-            dest=/etc/neutron/dnsmasq-neutron.conf
-
 - name: config metadata agent
   template: src=metadata_agent.ini
             dest=/etc/neutron/metadata_agent.ini backup=yes
@@ -86,13 +82,6 @@
   template: src=templates/neutron.conf
             dest=/etc/neutron/neutron.conf backup=yes
 
-- name: force mtu to 1450 for vxlan
-  lineinfile:
-    dest: /etc/neutron/dnsmasq-neutron.conf
-    regexp: '^dhcp-option-force'
-    line: 'dhcp-option-force=26,1450'
-  when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES }}"
-
 - include: firewall.yml
   when: enable_fwaas == True
 
diff --git a/ansible/roles/neutron-network/templates/dhcp_agent.ini b/ansible/roles/neutron-network/templates/dhcp_agent.ini
index 19eb62e..6f845c3 100644
--- a/ansible/roles/neutron-network/templates/dhcp_agent.ini
+++ b/ansible/roles/neutron-network/templates/dhcp_agent.ini
@@ -62,7 +62,6 @@ dhcp_domain = openstacklocal
 
 # Override the default dnsmasq settings with this file
 # dnsmasq_config_file =
-dnsmasq_config_file = /etc/neutron/dnsmasq-neutron.conf
 
 # Comma-separated list of DNS servers which will be used by dnsmasq
 # as forwarders.
diff --git a/ansible/roles/nova-controller/templates/dhcp_agent.ini b/ansible/roles/nova-controller/templates/dhcp_agent.ini
index 19eb62e..6f845c3 100644
--- a/ansible/roles/nova-controller/templates/dhcp_agent.ini
+++ b/ansible/roles/nova-controller/templates/dhcp_agent.ini
@@ -62,7 +62,6 @@ dhcp_domain = openstacklocal
 
 # Override the default dnsmasq settings with this file
 # dnsmasq_config_file =
-dnsmasq_config_file = /etc/neutron/dnsmasq-neutron.conf
 
 # Comma-separated list of DNS servers which will be used by dnsmasq
 # as forwarders.
diff --git a/chef/cookbooks/openstack-network/attributes/default.rb b/chef/cookbooks/openstack-network/attributes/default.rb
index 8d30502..8908375 100644
--- a/chef/cookbooks/openstack-network/attributes/default.rb
+++ b/chef/cookbooks/openstack-network/attributes/default.rb
@@ -228,12 +228,6 @@ default['openstack']['network']['nova']['send_events_interval'] = 2
 # The scheduler class to use for scheduling to DHCP agents
 default['openstack']['network']['dhcp']['scheduler'] = 'neutron.scheduler.dhcp_agent_scheduler.ChanceScheduler'
 
-# Override the default mtu setting given to virtual machines
-# to 1454 to allow for tunnel and other encapsulation overhead.  You
-# can adjust this from 1454 to 1500 if you do not want any lowering
-# of the default guest MTU.
-default['openstack']['network']['dhcp']['dhcp-option'] = '26,1454'
-
 # Number of seconds between sync of DHCP agent with Neutron API server
 default['openstack']['network']['dhcp']['resync_interval'] = 5
 
diff --git a/chef/cookbooks/openstack-network/spec/dhcp_agent_spec.rb b/chef/cookbooks/openstack-network/spec/dhcp_agent_spec.rb
index 49e9c58..cc0af52 100644
--- a/chef/cookbooks/openstack-network/spec/dhcp_agent_spec.rb
+++ b/chef/cookbooks/openstack-network/spec/dhcp_agent_spec.rb
@@ -116,10 +116,6 @@ describe 'openstack-network::dhcp_agent' do
         )
       end
 
-      it 'overrides dhcp options' do
-        expect(chef_run).to render_file(file.name).with_content('dhcp-option=26,1454')
-      end
-
       it 'checks upstream resolvers' do
         expect(chef_run).to render_file(file.name).with_content(/^server=209.244.0.3$/)
         expect(chef_run).to render_file(file.name).with_content(/^server=8.8.8.8$/)