Bug in previous fix to work around corrupted pickle files.