Revert "Hail Mary fix for leaving in tables"

This reverts commit 6df10e44bbe4f3c19c889a8127baa393d0e9163d.