Revert template bot "unique_fields" change