[PATCH COMMIT] Revert patch from 2006-01-27