Back out 7c8506b0729d (bug 843497) since I already backed out the rest of the bug's patches for xpcshell failures