Backed out d71120161e89 b5d49f1885af (bug 846200) due to missing xpc shell test fix patch