Revert the changes from this PR https://github.com/OpenFeign/feign/pull/2174/commits/2d55093ea7dd98d63482f39c5a8a59fa87aee56d