Revert "Merge branch 'organize-descrips-int-sub-functions' into 'pregmod-master'" See merge request !6945