See rB935e241fa6ea095493 for details of the issue, but first fix caused regression T47632. So for now handling the issue in a localized way, this is not a real solution (since this could happen in other cases), but will do for 2.77. This commit is to be backported to 2.77.