revert the addition of _pickle because it was causing havok with 64-bit
12 files changed