Back out c75ce018e5db (bug 978784) for Windows build bustage
CLOSED TREE
Automatic merge