Backed out changeset a31b0fd17a7a (bug 926665) for crashtest bustage