Last time for bug 3705, really!