Partially revert r65883 to let the tests pass.

I am working on the proper fix, which is to use the custom pickler in connection.send(),
instead of the standard pickle.dumps().