Backed out changeset 40c15b9a5d14 (bug 723281)
Backed out changeset d398e268b1db (bug 723281) since it relies on the now backed out bug 847890 on a CLOSED TREE