Bug 1079004, backout f2f8e93ea310 now bug 1078820 is fixed