Adapt to newer vanilla tar.gz content