Revert "Dropping the builder version to fix circular dependency"

This reverts commit 4ca47ec85f11b1c8edbb89b73e54f6a00adf784d.

This broke teh build for 1.9.2 and 1.9.3. Will have to go another way.