Comment 3 for bug 1631305

Here's a quick and dirty patch for stable/mitaka by the way. I won't get around to doing this properly until at least a week after the summit, but feel free to use this patch in the meantime.