s3: Fix a long-standing problem with recycled PIDs