Comment # 3 on bug 70916 from Kai

Your idea was correct! And bug 70913 is fixed as well with the mini patch I
used. Therefore I'm closing this as a duplicate.

I'll send a patch to the ML.

*** This bug has been marked as a duplicate of bug 70913 ***