Backed out changeset d59a1cce18e5 (bug 962599) for crashtest crashes.