Backed out changeset a46accc80752 (bug 1100284) for xpcshell bustage
Backed out changeset a7621853f055 (bug 1100284) for xpcshell bustage