Bug 895873 - backout bug 893117 for Win8 mc bustage