Really fix curl on Windows, this time after confirming it builds and links correctly. Ticket #3979