This fixes #8375.  It now separates them into different tables.