Differential Revision: https://phabricator.services.mozilla.com/D209355
mentioned in merge request !1040 (merged)