Revert "builder"

This reverts commit ff3da6376bb4033ac491f1f35fa44cf86c39be62.