Initial fix for requests 2.x.

XXX This is probably not the best way to do things, and we might also really need a better fix for standalone urllib3 >= 1.x, too.