Restore Folder pickle forward/backward compatibility with 3.12.0