Backed out changeset 9915f8dae4e5 (bug 867895) for xpcshell bustage and landing on the wrong branch.