Back out 01bc57172461:5bd9adbd3b15 (bug 843497) for xpcshell failures