Hope you've handled this.

If not, there's a new alternative right now that seems to be solving this really well. They're early access though.