@fabpot - why did you merge this particular commit if you also disagree with the above diff?