Comment 4 for bug 1140760

I'm okay with re-combining them into a single table (they were this way once upon a time before). The people who argued in favor of them being separate are mostly gone now anyways. ;-)