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