Back out 01093b5a774b (bug 948194) for not fixing enough races

--HG--
extra : rebase_source : 7e2d451639be57ef03818d84ba2e4e7fd72fa63d