Backout 09bdab645185 (Bug 907791) as it will not work with off-main-thread parsing.

--HG--
extra : rebase_source : 9b9cdc95fac77232e204fcdccb1bd5a2e827041b