Bug 916531 (follow-up) - Re-landed changeset 47e05e8df03b (bug 915482, part 4) because it wasn't causing hangs on Windows after all.  r=me.

--HG--
extra : rebase_source : 6c6e6dfa327e591a227e4da4bdb0539b6aaa2f05