Backed out changesets 96b4b6557736 and 0fec983a056b (bug 943234) for xpcshell failures. a=backout

--HG--
extra : rebase_source : 66e6d0d100738275be7a75460f09db024681399c