Improved build script
Revert "Improved build script"

This reverts commit 5992f261f70da413d0ab9111980d24d50806a6c9.
Improved build script