Sync back gecko changes

I completely forgot to land those on github first, sorry. I guess we can sync back the hash on the next patch.