Revert Template code changes