Looks like we take care of this in `addCookiesFromHeader`, but I think it makes more sense to take care of it here (if, say, in the future this is called from somewhere else), so I may just get rid of the cleanup there.