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