Comment 4 for bug 1014989

This may be a pretty simple change, even one that could be cherry-picked into the milestone-proposed branch after tuesday if need be. I'm ok with this staying targeted to F-2 for another day or two if Juliano thinks he will be able to get to it soon (his work was held up by an email I took a while to respond to... sorry!)