Revert my previous two commits about build script

This reverts commit 3acc6cf45a91c5cfd2c26cd20f76ec0dc449441b.