Backout 277bacd9f2f8 (bug 1023719) for causing intermittent crashes.

--HG--
extra : rebase_source : e6c9e54dd2df572da7f8cdf3cd6226a1aeeee883