Curl build fix after merge.