Back out cb68113d5052 (bug 901195) for xpcshell bustage
CLOSED TREE