Just need to wait for the fix in coreclr to propagate over to corefx. https://github.com/dotnet/coreclr/issues/7346