Backed out changeset 180e48cf37f5 now bug 1078820 is fixed