Revert "Rejigged the table id tagging again"

This reverts commit 12e1214f6caa09a9869403d3c8299cebbd593a0a.
take 2