Revert "Separate prepration of build v.s. build"

This reverts commit d39161bfdaf2b00229f9aa0a94a75d923285bc60.