I think MS is deeply sunk into a big cultural problem.
Everything is now sacrificed into promoting a single model and a single business, with users regarded as serfs to be herded where the Great Leader decides. The problem is the Great Leader(s) looks to have little grasp of reality - and appalling choices like this one are made. "If your organization does not use OneDrive, we recommend starting to plan an adoption campaign"? Really??
While in the past MS could be very nasty against competitors, it wasn't against its own users, and usually usability improved over time. Now users must be caged in Nadella's World.