Revert "Tweaking the table gap and grid APIs."

This reverts commit accba125d6fdad0cafdf909abc9d921a8127b0b2.
More work on the table gap API.