Comment 10 for bug 1317705

It's a shame we're not getting any details from the remote system as to why it doesn't like the negotiated options. Anyway, this seems to work (right?) so I'll get it landed.