Issue #24838: Merge tarfile fix from 3.5.