Revert 2004-04-16 change.