Backed out changeset 7dcecf85a869 (bug 984919)
Backed out changeset a3d1c00b6592 (bug 984919) for causing bug 988979