Revert "More netfilter rollbacks"

This reverts commit 90e40b05a9d39c37bdaea858d8c687d3a970f5e5.