[tor-commits] [torspec/master] Revert a little bit of that last change; put #6872 to bed.