Backed out changeset efdeaff02f48 (bug 937713) for causing bug 958771.