Undo template mods after removing defined type.
Merge branch 'test'