Backed out changeset 495a024e0c4d (bug 871423) for xpcshell failures.