Revert smarter build script for now