I updated the patch to apply cleanly, since recent changes caused conflicts.