Backed out changeset b8f1b1cfc9e2 (bug 952876)
Backed out changeset 75e5396d0847 (bug 933109) for xpcshell bustage