CRM-14052 - Revert workarounds for tokenInput.js and cleanup tagset code