Merge pull request #3108 from dhensby/master

Revert "FIX: allow CURLOPT_CONNECTTIMEOUT to be configured."