Backed out changeset 94fb66d82988 (bug 877584)
Backed out changeset 2864e2610800 (bug 877584) for causing bug 881266