Backout d29f06f3ff67 (Bug 840186) for orange galore

CLOSED TREE