Backout bdceed703766 (bug 887984) for Windows build failures.