Revert r262196

I am going to split this into two individual patches and test it with
the projects/pf branch that may get merged later.