Patch #3685

This bit us pretty hard in the last two days and it turns out Chris
had a patch written a year ago. What can we do to get this committed?

The crux is if you create a cookie with any optional parameters, it
will not be deleted because the cookie parameters are hard-coded in
the delete method.