Not with this patch, but eventually we should just pass the Builder directly. That way we don't have a 1 km constructor