Revert "Unified how to call 'builder'."

This reverts commit bd754cf9122012c2f5b03fa89eb9e4eb19132536.