Remove unnecessary Builder and fix merge issue. Fixes #520