Back out 4774010c55bd (bug 984015) for xpcshell bustage