Remove dup tags. Fix failed tests.
Merge pull request #17308 from cachedout/remove_old_style_tags

Remove dup tags. Fix failed tests.