Backed out changeset 2bfa24370b7c (bug 965461)
Backed out changeset a76b3c746743 (bug 960887) for xpcshell bustage