Revert "Builder API changed"

This reverts commit 48bfdacea266d48ca36c235fdbd94b498981e8c7.