Backed out changeset 8d28dc139503 (bug 984919)
Backed out changeset 39ba48e7ce21 (bug 984919) for causing bug 988979