Re-add the missing table wizard resorting (see #5575)