Back out the code changes from bug 841579 for causing a frequent intermittent failure.

--HG--
extra : rebase_source : 4748bf23718b781128f93364fad3c6ca924a2008