PFlow: Revert both Adam's MRs

These patches keep introducing unforeseeable changes. Efforts to fix it for consistency keep failing so I'm going to revert both my MRs.

I would suggest some close looks at how the code flows to check nothing odd is actually happening.