Backout 736a590cb652 and 0c409a9f58c9 (Bug 853423) due to xpcshell failures