Cleanup after join with HEAD

svn path=; revision=9445