[tor-commits] [onionoo/master] Partially revert the last commit.