diff --git a/systemvm/debian/opt/cloud/bin/cs/CsAddress.py b/systemvm/debian/opt/cloud/bin/cs/CsAddress.py
index 8e678251fe32..b5f48cd1222f 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsAddress.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsAddress.py
@@ -21,7 +21,7 @@
 import time
 import CsHelper
 from CsDatabag import CsDataBag
-from CsApp import CsApache, CsDnsmasq, CsPasswdSvc
+from CsApp import CsApache, CsPasswdSvc
 from CsRoute import CsRoute
 from CsRule import CsRule
 
@@ -566,10 +566,6 @@ def post_config_change(self, method):
                 logging.error(
                     "Not able to setup source-nat for a regular router yet")
 
-            if self.config.has_dns() or self.config.is_dhcp():
-                dns = CsDnsmasq(self)
-                dns.add_firewall_rules()
-
             if self.config.has_metadata():
                 app = CsApache(self)
                 app.setup()
diff --git a/systemvm/debian/opt/cloud/bin/cs/CsApp.py b/systemvm/debian/opt/cloud/bin/cs/CsApp.py
index 575ab2ac5b26..0b0ee1c6153c 100755
--- a/systemvm/debian/opt/cloud/bin/cs/CsApp.py
+++ b/systemvm/debian/opt/cloud/bin/cs/CsApp.py
@@ -81,24 +81,3 @@ def stop(self):
     def restart(self):
         CsHelper.service("cloud-password-server@%s" % self.ip, "restart")
 
-
-class CsDnsmasq(CsApp):
-    """ Set up dnsmasq """
-
-    def add_firewall_rules(self):
-        """ Add the necessary firewall rules
-        """
-        self.fw.append(["", "front",
-                        "-A INPUT -i %s -p udp -m udp --dport 67 -j ACCEPT" % self.dev
-                        ])
-
-        if self.config.has_dns():
-            self.fw.append([
-                "", "front",
-                "-A INPUT -i %s -d %s/32 -p udp -m udp --dport 53 -j ACCEPT" % (self.dev, self.ip)
-            ])
-
-            self.fw.append([
-                "", "front",
-                "-A INPUT -i %s -d %s/32 -p tcp -m tcp --dport 53 -j ACCEPT" % (self.dev, self.ip)
-            ])