This may be the same issue I ran into, here's how I'm currently solving it.
Looks like a recent 8.0.14 nightly may have a fix but I haven't tried it