Backout 1646e649878a (bug 835698) on suspicion of causing mochitest-1 shutdown hangs on Windows on a rather sad looking CLOSED TREE