this try block, try to unpickle first, then if that fails use json... defeats the whole purpose of this patch, it's still going to run pickle...

why not just check 'if method == "json"' first, rather than attempting to unpickle first.