Log Message: Switch to using the zipfile instead of the tar.gz, in the expectation that it fixes the build on 1.6.x. No change in the source code.