Revert "Merge netfilter stuff"

This reverts commit 5cd824bf18c67f1b5acd531822902c1b55ea0507.
Revert "Merge netfilter stuff"

This reverts commit a101ce660dacaab1d9b365ea47cbbf2d5daf55b3.