Revert "different approach"

This reverts commit 1449c5e.

Author: hauntsaninja

mypy/checker.py

@@ -8338,11 +8338,6 @@ def conditional_types(
             )
             return default, remainder
     if not is_overlapping_types(current_type, proposed_type, ignore_promotions=True):
-        if is_overlapping_types(current_type, proposed_type, ignore_promotions=False):
-            # Run the check again, taking into account promotions. If the types do overlap,
-            # then don't narrow to uninhabited
-            return current_type, default
-
         # Expression is never of any type in proposed_type_ranges
         return UninhabitedType(), default
     # we can only restrict when the type is precise, not bounded

test-data/unit/check-narrowing.test

@@ -3287,15 +3287,15 @@ from typing import Literal
 
 def f1(number: float, i: int):
     if number == i:
-        reveal_type(number)  # N: Revealed type is "builtins.float"
+        reveal_type(number)  # N: Revealed type is "builtins.int"
 
 def f2(number: float, five: Literal[5]):
     if number == five:
-        reveal_type(number)  # N: Revealed type is "builtins.float"
+        reveal_type(number)  # N: Revealed type is "Literal[5]"
 
 def f3(number: float | None, i: int):
     if number == i:
-        reveal_type(number)  # N: Revealed type is "builtins.float"
+        reveal_type(number)  # N: Revealed type is "builtins.int"
 
 def f4(number: float | int, i: int):
     if number == i: