Backed out changeset a9930b656941 (bug 892630) due to crashtest orange