Done: https://github.com/getlantern/lantern/issues/1300