Comment 1 for bug 1098320

This has been fixed on upstream's master branch by commit c236a51a8040508ee893e4c64b206e40f9459a62 and cherry-picked to the bobtail branch as 6008b1d8e4587d5a3aea60684b1d871401496942. The change does not seem to have been applied to argonaut.