Hack for 6002 to get around bug 879843.