Bug 916531 - Backed out changeset 47e05e8df03b (bug 915482, part 4) for causing hangs on Windows.  r=me.

--HG--
extra : rebase_source : 1c3d96a670c031137d984584449704f32f728c3f