Revert "Assembly Table Temporary Fix"

This reverts commit 2a24885d08f33cba67478648481fa707032d8f51.