Revert templateutils