Hm, r5572 was buggy, revert it and fix the issue correctly. Thanks to dna for pointing out the problem on IRC.
Authored by: cboos 2007-06-05
Parent: [r5580]
Child: [r5582]