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