Revert "Fix for better performance on large tables"

This reverts commit 9517ce8398bddfce48742b75c4e8fc113d59a77a.