CDB-2131 removed code associated with a bugfix renaming tables. It has side-effects upon importing, so undoing it.