Revert "Table overflow problem"

This reverts commit 66b1fddaaebd5ad436b4f349f1f23a11a4c71095.