backout of dad6d2941780 (oranges bug 890195)