Comment 34 for bug 1029582

Applied in 3.5.5.