With the extension separate revert to tarball and other fixes