Revert "bootstrap3 migration, tIDENTIFIER error"

This reverts commit 616962277bfc404bd6456444cfd57efd8d603f6d.
bootstrap 3 mass-upgrade!