Revert "Yet again, building addins from tarballs is broken."

This reverts commit ca3d75f57a05a517e276b0820302f6b60f91e9d6.