Back out f99521bfd197:38657fcd2d1a (bug 890570) for Linux xpcshell failures
CLOSED TREE