Issue #6477: Revert fbb97f6eb3b3 as it broke test_xpickle.
6 files changed