Improved build script
Revert "Improved build script"

This reverts commit 1efba4b8bb084edce2711cfb91a5d6fe79ca76d5.
Improved build script