Reversing logic to keep existing behavior