Merge pull request #130492 from roberth/revert-130196-partially
Partially revert "various: cleanup of 'inherit version;'"
authored by Robert Hensing and committed by GitHub 4 years ago 66c6ec45 da37c8eb