Backing out bug 993029 due to Win8 debug test failures. CLOSED TREE