Created attachment 149521 [details]
(apply with -p1 to CURRENT)
As described. This is part of a local patch we carry at Isilon, maybe it's silly.
Does Conrad's proposed patch in this bug seem sensible with the casting, or do you think there's a better solution to this problem?