Revert "same change made to other method-building portions of the builders" - to help out with a clean merge from builder_refactor
Revert "same change made to other method-building portions of the
builders" - to help out with a clean merge from builder_refactor

This reverts commit 98d94a06d7e9b7c1c5efa9fdea47d3f501d66636.

jasonroelofs/rbplusplus,jasonroelofs/rbplusplus,jasonroelofs/rbplusplus,jasonroelofs/rbplusplus