I believe this is fixed by r24568 (#7014).  I'll merge this ticket into 
that one.