This reverts commit 909398efc7. It looks like it's causing trouble with tor on some setups
909398efc7