Back out febd08d19087 (bug 918090) for xpcshell bustage