I think Lars would be the best person to help you fix this. A new bug report addressing this specific problem and how you can "fix" it would also help. I say "fix" because reverting that commit would bring back bug 19587 .