First pass to fix bug 913003