Back to Bryan's original version (grrr, still doesn't work)
Authored by: bcornec 2007-10-18
Parent: [r698]
Child: [r700]
