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