(cherry picked from commit 67305d1b0a)
67305d1b0a
Same rationale as the previous commits. (cherry picked from commit 422196759f) Removed the winrt-specific parts.
422196759f