Revert too many changes for allowing Tor