2xr = bbaetz

Also fixes Duplicate Bug 165685 When switching from no cookiepath to using cookiepath, old cookie gets in the way