Initial import: svn 24885.