Did you resolve your issue?
I ran into similar issue recently and am struggling to figure out how to get out of this.
