[OE-3393] Revert sort patch