Comment out the group splliting of tables for now, since it would require lots of changes.