diff --git a/roles/2-common/templates/iiab-startup.sh b/roles/2-common/templates/iiab-startup.sh
index b563b908d..e84eab8f0 100644
--- a/roles/2-common/templates/iiab-startup.sh
+++ b/roles/2-common/templates/iiab-startup.sh
@@ -31,8 +31,8 @@ if [[ $(grep -i raspbian /etc/*release) &&
         #)
    #]];
 then
-    ip link set dev wlan0 promisc on
-    echo "wlan0 promiscuous mode ON, internal AP OFF: github.com/iiab/iiab/issues/638"
+#    ip link set dev wlan0 promisc on
+    echo "wlan0 promiscuous mode ON, internal AP OFF: github.com/iiab/iiab/issues/638 DISABLED"
 fi
 
 exit 0
diff --git a/roles/network/templates/network/iiab-hotspot-off b/roles/network/templates/network/iiab-hotspot-off
index 2341c6f5b..5541a260e 100755
--- a/roles/network/templates/network/iiab-hotspot-off
+++ b/roles/network/templates/network/iiab-hotspot-off
@@ -1,19 +1,19 @@
 #!/bin/bash
-sed -i -e "s/^denyinterfaces/#denyinterfaces/" /etc/dhcpcd.conf
+#sed -i -e "s/^denyinterfaces/#denyinterfaces/" /etc/dhcpcd.conf
 systemctl disable hostapd
 systemctl stop hostapd
 #systemctl disable dnsmasq
 #systemctl stop dnsmasq
-systemctl daemon-reload
-systemctl restart dhcpcd
+#systemctl daemon-reload
+#systemctl restart dhcpcd
 #systemctl restart networking 6/15/2019 TFM removed
 
 # Temporary promiscuous-mode workaround for RPi's WiFi "10SEC disease"
 # Set wlan0 to promiscuous when AP's OFF (for possible WiFi gateway)
 # SEE ALSO iiab-hotspot-on + /usr/libexec/iiab-startup.sh
 # https://github.com/iiab/iiab/issues/638#issuecomment-355455454
-if grep -qi raspbian /etc/*release; then
-    ip link set dev wlan0 promisc on
-fi
+#if grep -qi raspbian /etc/*release; then
+#    ip link set dev wlan0 promisc on
+#fi
 
 sed -i -e "s/^HOSTAPD_ENABLED.*/HOSTAPD_ENABLED=False/" {{ iiab_env_file }}
diff --git a/roles/network/templates/network/iiab-hotspot-on b/roles/network/templates/network/iiab-hotspot-on
index 9b57c579a..c88130d4c 100755
--- a/roles/network/templates/network/iiab-hotspot-on
+++ b/roles/network/templates/network/iiab-hotspot-on
@@ -1,13 +1,11 @@
 #!/bin/bash
-cp -f /etc/hostapd/hostapd.conf.iiab /etc/hostapd/hostapd.conf
-sed -i -e "s/^#denyinterfaces/denyinterfaces/" /etc/dhcpcd.conf
+#cp -f /etc/hostapd/hostapd.conf.iiab /etc/hostapd/hostapd.conf
+#sed -i -e "s/^#denyinterfaces/denyinterfaces/" /etc/dhcpcd.conf
 # shut down wlan0 in case connected to network
-ip link set wlan0 down
+#ip link set wlan0 down
 systemctl enable hostapd
-#systemctl enable dnsmasq
-systemctl daemon-reload
-systemctl restart dhcpcd
-#systemctl restart networking 6/15/2019 TFM removed
+#systemctl daemon-reload
+#systemctl restart dhcpcd
 systemctl start hostapd
 systemctl start dnsmasq
 
@@ -15,9 +13,9 @@ systemctl start dnsmasq
 # Disable "promiscuous" on wlan0 when AP (i.e. no WiFi gateway)
 # SEE ALSO iiab-hotspot-off + /usr/libexec/iiab-startup.sh
 # https://github.com/iiab/iiab/issues/638#issuecomment-355455454
-if grep -qi raspbian /etc/*release; then
-    ip link set dev wlan0 promisc off
-fi
+#if grep -qi raspbian /etc/*release; then
+#    ip link set dev wlan0 promisc off
+#fi
 
 sed -i -e "s/^HOSTAPD_ENABLED.*/HOSTAPD_ENABLED=True/" {{ iiab_env_file }}