Backed out changeset 489c1aed4461 (bug 873937) for causing bug 895976. a=backout