3ad86e2
- back down to the earlier version of the patch for #551764; the backported alternate version was incomplete