Comment 10 for bug 1822026

The commit will be reverted due to 1824677, so reopening until a patch with a smaller impact will be applied