Revert the change that avoid the table creations