Backed out changeset cacb9f3ee44d (bug 840693)
Backed out changeset c1f4eff03e82 (bug 840693) for causing bug 838563