This reverts commit 3f34ccc8. We need to discuss a bit more (that thread local is probably unavoidable given the design of Feign, but I don't like it yet). See gh-841
