[Bug 235934] patch from ~2007-01-16