[OE-2891] Reverse logic for CR9