Backout 450a302d1ffa (bug 983571) due to xpcshell failures