The patch I previously applied from Brian Webb was 2 lines off. Oops.
2 files changed