Fixed #21430 -- UnpickleException raised when unpickling from different versions.