Revert "fix builder generic type"

This reverts commit 51f54f0decbda47ecbae976c375b387ae6570a41.