Remove outdated line which of course cvs merging never detects...