Revert "dist build"

This reverts commit 40cf385a28a70178e4daee20d5f95b592755d5d2.
Revert "Revert "dist build""

This reverts commit 6147f6ffaee3de20dee0aa557ed53815b1e3fc91.