This came up in a search; it appears to have been dealt with in #6028 
(r20531).  I'm not sure which direction to do the ticket merge in.