Revert "Use tarball_basedir for tarball name"

This reverts commit 53a436be15de1de85ef4c505688e87be316dfcf2.