CHANGE: undo template identifier