Yet another thing for bug 3705