Backed out 5fa1f7715c19:7a300d1d1b23 (bug 855130) for Windows build failures
CLOSED TREE