Remove old-style event tags.

Closes #13368
Merge pull request #17235 from cachedout/remove_old_style_tags

Remove old-style event tags.