patch against 8.4-branch 2004-05-27