Revert "TRUNK-4040 Preferred concept name tags converted improperly"

This reverts commit e354eda32b8d288805a8fa8d2a4502987cc9dc48.
TRUNK-4040 Preferred concept name tags converted improperly