There has been some rework done to the PPS code so we might need to consider backporting that as well, or just adapt the patch to fit the old model. I'll take a closer look.