Backport of Mozilla #1066190

Camilo has kindly provided us with a patch. To be attached below.