In !4591 and !4593 the same problem was fixed in the code.
!4593 was merged before !4591, and !4591 was merged without
testing on the current trunk. This leads to a double entry
of the fix. This is now fixed.