Comment 27 for bug 1641238

Can we please backport this to 2.4.x branch? It is not present in 2.4.35 :-(