As the checkin message on the branch said, this should make the new
code work correctly using pickles generated by the old code.