Backed out changeset c80de8d196af (bug 962599) for crashtest failures