Add my pending-review patch for invoking patchpoints

Will get rid of it once it's merged upstream