[COMMIT] Undo Stephen's change of 2004-05-11