[tor-commits] [community/develop] Partially revert commit 404d5ca.