r13641: Finish fix for #3510. Don't use client schannel when told