Backed out changeset 1082eae712e0 (bug 939569) for Windows build bustage

Landed on a CLOSED TREE