partially revert "pf bugfixes"

This reverts commit 77c36c332f1028e61d90f1526209c149e7642a8a.