Backed out changeset 0ed80fcff168 (bug 864447) since the other changeset was backed out