[tor-commits] [tor/master] Revert accidentally-committed code from 046acf208bc53a3fa7ea9