[tor-commits] [torbutton/master] Bug 28894: Remove Torbutton parts of fix for #20244