Cookie jar was fine.  So removed our changes from cookiejar and will remove the fork