Revert "Revert "builder""

This reverts commit 4add90c96e371bc45d51b4308035016e548117a3.