Workarounds for CloudWatch templating error

I’m trying to add a log panel to an existing regular templatized dashboard. I’m getting the error "Multi template variables are not supported for fields, even though I’m only using one template variable the @logstream field.

I think that I’m facing the same issue as described in this GitHub issue - "CloudWatch templating error" when using Multi template variables in statistics field · Issue #20960 · grafana/grafana · GitHub

Is there any workaround for this that anyone knows of, or can I not add a log panel to a templatized dashboard?

Thanks!