actually fix pickling in 3.x