First pass at fixing the s3 client TimeoutConnections problem.