Back out kturner's old table restructure for now.

Back out kturner's old table restructure for now.
This will require downtiime on upgrade, so we're not going to do it until we have a better idea of the cost and can make all necessary changes at once to minimize it.