Backed out changeset c0e5db20b655 (bug 922942) for xpcshell bustage