getlantern/lantern#1762 Suggested improvements to original fix