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