Backed out changeset eb2f0c1fffc2 (bug 820613) for xpcshell failures.

--HG--
extra : rebase_source : 7fff4cec5a4d7839cd3ede5cd0322631e11f9d38