Resolved here: https://github.com/mozilla-b2g/gaia/pull/18848/files#diff-41b8b2880b0e0d6244503bd5b64610f1R45