Trial fix for bug 886782