Backed out changeset 8d2cc1387119 (bug 968709)
Backed out changeset 5f7e58de5d56 (bug 968709) for causing bug 1023167