Revamping build (again).