Revert "Zach's hacky hack that hacks on tables"

This reverts commit 1443ee238f6ae937cd0ec786d9ff5472a4ba2836.