We also fix bug 919004 here.