We want to use the fix ups that use NuGet. However, they break the windows build-bot. At the moment the windows build-bot is more important than the better locale code - hence reverting.