Backed out changeset 0577eb1893c4 (bug 840094) for orange++