Revert 77566f61 and followup fixups

Merged Alex Catarineu requested to merge acat/torbutton:revert_eoy2020 into master Jan 18, 2021