needed but trivial changes -- "apply pr2" doesn't work at my end.