Comment 7 for bug 1255355

I'm marking this as committed since there has been no other activity, Alan's question went unanswered, and it appears to have been fixed and backported.