Comment 52 for bug 1641238

Backported to v2.4.40.