Backed out changeset 9394e6901453 (bug 958008) for causing bug 960224.