Reverting the table generation

Aparantly, it's timing isn't good.