Our necessary custom changes will be reapplied in later commits for clarity, and saved as patches for future updates. (cherry picked from commit cb0f771aaa)
cb0f771aaa
Same rationale as the previous commits. (cherry picked from commit 422196759f) Removed the winrt-specific parts.
422196759f