Backed out changeset f0f88a7512a5 (bug 880885) due to bad bug number.
Backed out changeset 4e5d6e8d8849 (bug 880885) due to bad bug number.
merge backouts (bug 880885)