Backed out changeset d53dc428fc55 (bug 958008) for causing bug 960224.