In the original change (68c5d90a)
We assume that
Went through
Tested a bit:
and don't see any other problems.
If ok should be backported to master
@mark