Bug 5510: fix of bug 0004530 is not correct. Has now been fixed and rerun.