port c6771297b6f03887034c5f121d3dbf701623ab87 from Pd-l2ork: the big Vanilla forward port won't compile without this commit