Backed out changeset d6249744132e (bug 839862) because xpcshell bustage (attempt 2)