This reverts commit 8ea996f6. Having the primary builder hinders automatic error reporting by separating the error message from the failure status.