Backed out changeset 65a7440e87ea (bug 1027092)