Fixes #8675 Effectively reverts #8633, which introduces weird edge cases (cherry picked from commit 4f5270cb7debf3a523f9a4aa5bb7c8c62b05be7d)
Fixes #8675 Effectively reverts #8633, which introduces weird edge cases (cherry picked from commit 4f5270cb7debf3a523f9a4aa5bb7c8c62b05be7d)