Backed out changeset 6ddd5fb7f041 (bug 867118)
Backed out changeset 4a496e6b99af (bug 867097)