Don't monkey-patch six, simply use it as normal.

We only monkey-patched six as 1.3 was missing various moves, especially
related to httplib. Users can simply install with a newer version of
six.