I assume the new hint table is to replace this, and there will be another commit with the data migration and code change?