Followup r108403, use data providers