jhb@ already fixed this in a different way Reported by: andrew This reverts commit 3810b37903220af1a369d3c4032ae25fb2d7949d.