Repair trunk: work-around for #843, unpickling troubles