We don't really have an ETA yet, it seems like an external issue. But, my guess, it probably won't take more than a few releases.
You'll know if it's fixed if someone updates this thread, or just start trying every new release in 2017 
If there are no other issues, you should be able to use that "Microsoft" option.