Try this again for bug 3705