CDB-2131 removed code associated with a bugfix renaming tables. It has side-effects upon importing, so undoing it.
Merge remote-tracking branch 'origin/CDB-2131' into hotfix-20140326