Last commit of branch cleanup-2008.