Re-revert the previous and fix tarball

This reverts commit 155996ebde2a9042b0252954245d298008755dc5.

I'm sorry for the problems. Now I checked the tarball does build locally.