Revert last change on template core, due to I don't like it Problem.