Could you take a look to @rwldrn suggestion https://github.com/mozilla-b2g/gaia/pull/8159#discussion_r3126869 ?