Backed out changeset 2a9cfbab0adc (bug 1053999) for Windows build bustage on a CLOSED TREE