Skip svn changes up to r31267