This is basically always the behaviour we want.
This reverts commit bcdaee7d39.
bcdaee7d39
This reverts commit 3e2e2a7000, reversing changes made to d94801b6c6.
3e2e2a7000
d94801b6c6