Backing out 824b68f13f30 (bug 679364) - oranges