Indavertent revert of #3203

[dsyme]

Tracking comment #3203 (comment) in case it gets lost:

it seems this change was inadvertently reversed in f52362a. And indeed I am again experiencing the issue.

[dsyme]

cc @Tarmil

[dsyme]

@Tarmil Could you resubmit your fix please (revert the revert :) )

[Tarmil]

I did it as #4202.

[dsyme]

Thanks, merged