Just for an update. I spent some time working with some other map devs and have been unable to create any work-around for this issue. Its on Blizzards side.
Blizzard recently added the issue to a known bugs list. They also have a patch window on Tuesday so that is likely the earliest it could potentially be fixed. Until they update our hands are tied.