make: bring back the builder