Somehow commit r1356 got lost in the ether.  I'm not sure how, but now it's fixed.