Use builder, not deprecated constructor
Merge pull request #6599 from bstansberry/fix-use-depr

Use builder, not deprecated constructor