Well, it seems that you didn't notice my comment talking about this above. Please take a look here : 
https://github.com/mozilla-b2g/gaia/pull/12736#issuecomment-26580125

Thanks Julien !