Implementation of #9502
This is basically always the behaviour we want.
This reverts commit bcdaee7d39.
bcdaee7d39