Backout 6a84bba784c9 and df399d443e57 (Bug 853423) for xpcshell failures