Restored ability to unpickle instances pickled before 22.2.0.