Revert "Reduce number of iptable-save restore loops"

This reverts commit f0539d49271df76222740f76d1b51188ee51a1c3.