Let's try this again bug 3705