Backed out changeset ae6de471bcd7 (bug 1058566) for causing bug 1067978.