correctly disable iptables
Merge commit 'ef9edbff93d14f9373104bf40291a32e747ba219'