Backed out changeset ae8ab59fc469 (bug 834737) for orange