This will require updating for trunk: my latest patch separated `download_package` and `extract_package`