Issue #1384480, Follow-Up #1356434: Switch back to real taxonomy term reference fields from taxonomy module.